TRUNK-4251: Patient dashboard issue when using french locale
Merge pull request #699 from alexisduque/TRUNK-4251

TRUNK-4251: Patient dashboard issue when using french locale
TRUNK-4300 - OpenmrsCookieThemeResolver should never throw an exception, because that would break the uncaughtException page

(cherry picked from commit cf9f6e1f29d66fab9e80ffc7723f461fa3327b22)
TRUNK-4325 Randomly failing tests in ShortPatientFormControllerTest

(cherry picked from commit 13c0dab4d28f17a92935ea7a9571945dc49bf227)

Conflicts:
	web/src/main/java/org/openmrs/web/controller/patient/ShortPatientFormController.java
TRUNK-3882 Custom tag to render errors
Merge pull request #787 from jkondrat/TRUNK-3882

TRUNK-3882 Custom tag to render errors
TRUNK 4281: translate hard coded messages for cohorts
Merge pull request #809 from ehsdev/1.9.x

TRUNK 4281: translate hard coded messages for cohorts
TRUNK-4052 Add a way to test liquibase changesets

(cherry picked from commit 96209fa0140fd5405dd9a578ab53d79ad708a03f)
TRUNK-4335 Validate liquibase against hbm

(cherry picked from commit 4e95bda5c6d198fa909304a212c37f80edc870a0)
(cherry picked from commit 4f5cfa5d736190a8ac97d9f4e9a4f0e94cf02644)
TRUNK-4335 Committed 1.9.x specific fixes
Merge pull request #512 from dkithmal/TRUNK-3919

Trunk 3919
(cherry picked from commit ff984a0e58f79928715dba79be87a15385c40353)
TRUNK-4344 Add liquibase validation step to DatabaseUpgradeTestUtil

(cherry picked from commit 72e8287b597ce4389178c53756271a3386702dc2)
Revert "TRUNK-4344 Add liquibase validation step to DatabaseUpgradeTestUtil"

This reverts commit 9f8d65a2764e3589af9d397dcbf982bf09513ab8.
TRUNK-4036: Retiring a Location also retires the location tag
TRUNK-4348: OpenmrsClassLoader improperly choose ModuleClassLoader when one module name is a substring of another module name
added a blank line to trigger a build since i can't log into bamboo
TRUNK-4361: When merging patients, addresses from Non-Preferred Patients should not be set to preferrred
Filled out Independent annotation description
Merge pull request #870 from kkaczmarczyk/TRUNK-4036-1.9.x

TRUNK-4036: Retiring a Location also retires the location tag