Merge pull request #351 from CruGlobal/MH-977v2

Opt out text enhancements
Merge branch 'dev' of github.com:CruGlobal/missionhub into dev
Merge received and created interactions when merging contacts
Merge branch 'MH-1006' into dev