Fixing error when merging contacts and selecting household from the non-master one.
Merge branch 'feature/352-contact-merge' of https://github.com/SalesforceFoundation/Cumulus into feature/352-contact-merge