fixes #7854 change opt out option
Merge branch 'dev' of github.com:nysenate/Bluebird-CRM into dev