TRUNK-3351 Merging persons incorrectly handles addresses and names 

Fix for Jira TRUNK-3351
Merging persons incorrectly handles addresses and names