TRUNK-3551 Merging Person and Address.  Cherry-picking Tom Ryan's commit and fixing some failing unit tests
(cherry picked from commit cb78ceb3031dc10c69af7fd047dd88fddf922895)
TRUNK-3551 Merging Person and Address.  Remove references to commons lang3 from import
(cherry picked from commit a726e94e42e717215984e8774a9b730ed99064e3)
Merge pull request #228 from mseaton/1.9.x

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