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
When you open the edit page for a scheduled task, if you leave the page
without saving, the repeat interval unit gets changed to seconds no
matter what it was previously - TRUNK-3759(cherry picked from commit ac9bb64c8f7b11beac45775bddd34fdb52370d4e)
TRUNK-3190: add unit test for HibernateConceptDAO.getConceptsByAnswer
(cherry picked from commit 34d76e2169c293649f6bbf79908ff7ab437cce0a)
Revert "update all of these types of extension point links to use c:url so that"

This reverts commit b75519dd17a893a0bba1e327b19f4ddbb1000182.