CRM-13836 Handle multivalued custom sets during merge