[bug 882923] Update opt-out for GA
Merge pull request #1224 from alexgibson/bug-882923-update-opt-out-for-ga

[bug 882923] Update opt-out for GA