1.9.x - Backport for TRUNK-3551: Merging persons incorrectly handles addresses and names