fixes #7862 uncheck optout if a subscription option is selected
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev
Merge branch 'dev' into test