Back porting to 1.9.x: Erasing a short name in the edit concepts page
should void it - TRUNK-3445
TRUNK-3658: FormService.saveFormResouce doesn't effectively replace
existing resources(cherry picked from commit 146cd66855b4f569f6288c3d937069206ee4b336)
Back porting to 1.9.x: Encounter autocomplete should filter results by
patient - TRUNK-3231
Install from Module Repository feature does not work under maven+jetty -
TRUNK-1852(cherry picked from commit 7ad9ad93b139ef47b4ccb9eca8d96e515734bc0c)
update all of these types of extension point links to use c:url so that
we are consistent - TRUNK-3770
TRUNK-3846(cherry picked from commit cda25d93e01904bd7d3f2e2bd93ed6c508bb3609)
Back porting to 1.9.x: Handle complex observations (ED) in ORUR01Handler
- TRUNK-3887
TRUNK-3449 - settings page using textarea(cherry picked from commit ee544be054f06e62c818bf2c750bb2f26b7cae3d)
Back porting to 1.9.x: Using initialization wizard with db on separate
machine - TRUNK-2765
TRUNK-3900: Add ProviderByPersonNameComparator
fixed a comment
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)