TRUNK-3768: drugOrder.drug should not be a mandatory field for drug order
Retrieving a ProgramWorkflow by name in a the ModuleActivator started
method throws an error - TRUNK-3739(cherry picked from commit 2529954ae4b0497cde2ab110c789926e296d98a2)
Merge pull request #223 from rowanseymour/1.9.x

TRUNK-3768: drugOrder.drug should not be a mandatory field for drug order
Bad error message is displayed when reference term validation fails -
TRUNK-3911
Revert "Retired concepts aren't showed as retired when listed as set members -"

This reverts commit fbea3b76d5cc0ccc66fe41d7ebed0c26763ca11b.
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