[TRUNK-3913] 1.8.x Backport of TRUNK-3351: Merging persons incorrectly handles addresses and names

Resolved part of TRUNK-3913 with 1.8.x Backport for TRUNK-3351 
Merging persons incorrectly handles addresses and names