CLC-4324-QA - Calendar opt-in: opt-out users shouldn't see "are you sure" when disconnecting

https://jira.ets.berkeley.edu/jira/browse/CLC-4324
Merge pull request #3019 from christianv/CLC-4324-qa

CLC-4324-QA - Calendar opt-in: opt-out users shouldn't see "are you sure...