Bug 912554 - [Contacts] Preserve givenName and familyName of the new or ...

...being edited contact when merging.