TRUNK-3919 Removed dbms from changesets and changesets duplicated by TRUNK-4335
Fixed formatting
TRUNK-4344 Add liquibase validation step to DatabaseUpgradeTestUtil
TRUNK-4343 Unit test fails when building with java 1.8.x
Revert "TRUNK-4344 Add liquibase validation step to DatabaseUpgradeTestUtil"

This reverts commit 72e8287b597ce4389178c53756271a3386702dc2.
Merge pull request #859 from lluismf/TRUNK-4343

TRUNK-4343
TRUNK-3780 Searching for patient with patient name/new feature
Fixing liquibase upgrade error for: TRUNK-4334
TRUNK-4323 Retired location attributes should not be shown when viewing
location hierarchy; they should be marked as retired in the tree view
TRUNK-4348: OpenmrsClassLoader chooses wrong ModuleClassLoader when one module name is a substring of another module name
added blank line to re-trigger build since bamboo logins are down
TRUNK-4030: locking mechanism for form_id
Remove Logic Module as a core module - TRUNK-3169
added openmrs core english to chinese localization property file
Merge pull request #881 from harsha89/TRUNK-4321

added openmrs core english to chinese localization property file
TRUNK-4361: When merging patients, addresses from Non-Preferred Patients should not be set to preferrred
Merge pull request #874 from lluismf/TRUNK-4323

TRUNK-4323 Retired location attributes should not be shown when viewing location hierarchy; they should be marked as retired in the tree view
Doing some maven formatting for: Retired location attributes should not
be shown when viewing location hierarchy; they should be marked as
retired in the tree view - TRUNK-4323
added modifications to existing pull request 717 TRUNK-3293
Merge pull request #876 from rpuzdrowski/TRUNK-4030

TRUNK-4030: locking mechanism for form_id