Merge pull request #1773 from davejenx/CRM-8338-merge-by-household

CRM-8338 implement CRM_Contact_Form_Task::mergeContactIdsByHousehold(), ...
Merge pull request #2673 from kurund/CRM-8338

backport household merge fixes to 4.4, CRM-8338