CRM-11912 backport of UFMatch create & hook
CRM-11799 fix on form is_primary for address handling

CRM-11799 fix on form is_primary for address handling