details on server get overwritten by client during sync

[Bill Filler]

For google contact sync, the following occurs:
- add a phone number for a given contact on the server (using gmail.com in browser)
- for the same contact in the address book, add an email address and save

Expected result:
after the sync, the contact should have the fields merged, with new phone number and new email address

Actual result:
- the phone number that was added gets dropped and is not displayed in either client or server