CRM-13836 Handle multivalued custom sets during merge
Merge pull request #2167 from colemanw/CRM-13836

CRM-13836 Handle multivalued custom sets during merge