CLC-4322 Fix persistence logic for opt-in/out
Merge pull request #3022 from ctweney/clc-4322-qa

CLC-4322 (QA) Fix persistence logic for opt-in/out