Merge pull request #8211 from crdlc/bug-842950

Bug 842950 - [Facebook] When editing a Facebook contact, the address is ...(cherry picked from commit 1b6d7b18dcedca4582eb4a0882f1993d5514c05e)

Conflicts:
	apps/communications/contacts/js/contacts.js