Revert "Retired concepts aren't showed as retired when listed as set members - TRUNK-3840"

This reverts commit 573b613f1c6a592c72e1042b5ad7998c9c55370f.
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
TRUNK-3204 : Add JUnit test for getting by null/true/false isPreferred in HibernatePatientDAO.getPatientIdentifiers