Comment 1 for bug 1573372

Pulled Jason's working branch working/user/dyrcona/lp1573372-fix-opt-in-test and tested fine both ways, it will now skip if opt-in is not enabled and run the tests if opt-in is enabled.

Pushed to master and backported to rel_2_10.