#1225.  Make query selective by avoiding formula field contact.HHId__c  usage in query.
Merge branch 'feature/sprint30-misc' of https://github.com/SalesforceFoundation/Cumulus into feature/sprint30-misc