TRUNK-3551 Merging Person and Address.  Cherry-picking Tom Ryan's commit and fixing some failing unit tests
TRUNK-3551 Merging Person and Address.  Remove references to commons lang3 from import
Merge pull request #227 from mseaton/master

TRUNK-3351: Merging persons incorrectly handles addresses and names