A fix for BAU-113, users can not set their new email to an email address that is in use
Merge remote-tracking branch 'origin/dev-BAU-113' into release/2.9.18rc
Creating release candidate with BAU-113
Adding in release note for 2.9.18
Merge branch 'master' into dev-BAU-102