Merge pull request #11268 from mattwire/CRM-21421_allow_updating_existing_casecontact