TRUNK-3960 Reload log4j.xml configuration without server restart (backporting f3de4b6b16c2fc6e7a45cb404a2e87dc912297b2)
TRUNK-4012 Tweaked install-h2 profile
TRUNK-4040 Preferred concept name tags converted improperly
TRUNK-4040 Fixed formatting for checksum to be valid
TRUNK-4042 Application Data directory location read from system property

(cherry picked from commit 2e04b5b09fc12640317a41c659ccd97c164a79d2)
TRUNK-4043 Rename installation.script system property

(cherry picked from commit ee41a749759a8c73166910d2e31eab7cae0d1ba6)
[TRUNK-3652] Natural ordering of Patient State is not consistent with equals

applying auto format
Made change to use pre generated uuid in tests - TRUNK-3652
TRUNK-3738 Fixed stopping module
TRUNK-4049 Daemon cannot assing System Developer role
Concept.getName(Locale) and Concept.getName(Locale, false) are broken - TRUNK-3981

Renamed ConceptGeNameMethodTest to ConceptIT, also cleaned up the code in Concept.getName(Locale, Boolean) - TRUNK-3981

applying auto format changes

Renamed ConceptIt to ConceptComponentTest
locking mechanism for encounter_type - TRUNK-4033

[TRUNK-4033] made some changes

added a testcase, and made some other changes

[TRUNK-4033] added a disabled attribute if encounterTypesLocked == 'true'

[TRUNK-4033] added a testcase i.e. EncounterService.saveEncounterType_shouldNotSaveEncounterTypeIfEncounterTypesAreLocked()

[TRUNK-4033] added some other testcases and made some changes

Removed or converted throws clauses for EncounterTypeLockedException to APIException - TRUNK-4033

Removed unused import in HibernateEncounterDAO
Fixing Problems with ClassCast Exception - TRUNK-4053(cherry picked from commit 1850c17f0d1cb437ee26ff9d0dde9cc1b1c1d706)
First attempt at fixing failures which do not happen locally, but only
on bamboo
Putting on hold the fix for: Problems with ClassCast Exception -
TRUNK-4053
Backporting to 1.9.x: In context-sensitive tests, @SkipBaseSetup
annotation is not inherited from superclasses - TRUNK-4051
author:namefilip
Back porting to 1.9.x:
SchedulerServiceTest:shouldAllowTwoTasksInitMethodsToRunConcurrently
fails randomly - TRUNK-3596
Back porting to 1.9.x: Error when adding a task in version 1.9.3 -
TRUNK-3970
TRUNK-3956 ~ caught the DataIntegrityViolationException error
(cherry picked from commit 996ddca7c8c64ac87f7c2a54addf81f923b82966)
Back porting to 1.9.x: Locally Exposed Database Credentials - TRUNK-3936
author:h3llborn