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
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.
Merge pull request #219 from rowanseymour/master

TRUNK-3862: Unnecessary logged exceptions when saving forms(cherry picked from commit de7fd1bd259ebb7ab95eb18659cbb19fd680cd3e)
[maven-release-plugin] prepare release 1.9.3
[maven-release-plugin] prepare for next development iteration
backport for TRUNK-3170 getProviders(String query, Integer start, Integer length, Map<ProviderAttributeType, Object> attributes) should allow the option to include or not include retired providers
reverted unintented deletion of logic omod
Manage Providers spinning status wheel turns before entering search
terms - TRUNK-3339

Resolved last conflict - TRUNK--3339

Removed @Transactional annotation from ProviderService method -
TRUNK-3339

Fixed the @since version to 1.9.4 - TRUNK-3339
Updated obs did not get displayed correctly on dashboard - TRUNK-3609
Fixed @since value for drug.displayName - TRUNK-3609
Fixed compilation error - TRUNK-3609