Applying auto format changes
TRUNK-3970: Fix NPE
(cherry picked from commit 96fb5b042328eb055ee3c66496f2937cad2dad9d)
Back porting to 1.9.x the unit test for: Error when adding a task in
version 1.9.3 - TRUNK-3970
Ignoring failing unit test untill when it gets fixed - TRUNK-3970
Cannot find concept by id in concept auto complete - TRUNK-3893(cherry picked from commit ea4e8449dac09f670d580eaabda2c5b756f2fdb3)
Merge branch '1.9.x' of github.com:openmrs/openmrs-core into 1.9.x
Add SerializableComplexObsHandler interface for form processing methods
- TRUNK-3886(cherry picked from commit 7f2dca6a23dd8fa79c4fde7317d5036b9c6d2679)
Fixing failing unit tests for: Encounter autocomplete should filter
results by patient - TRUNK-3231 (cherry picked from commit 90fa76541c0db24f2f6197b89a05f96fe26db0ed)
 forward porting to 1.9.x: EL functions defined in modules are not

accessible when used in portlets - TRUNK-3743
TRUNK-3589: Add LocationService method to search for a location by a location attribute
Removed the previously deprecated getLocations methods from the DAO layer
Merge pull request #357 from rowanseymour/1.9.x

TRUNK-3589: Add LocationService method to search for a location by a location attribute
Back porting to 1.9.x: Changing login password deletes secret answer -
TRUNK-3877
Corrected handling multiple handlers

(cherry picked from commit 7bce797c06f4b6751fa1e9464cf2281c903510d1)
Corrected formatting
TRUNK-4012: Support H2 Database

(cherry picked from commit d805baecec551129cbcb07c9ecb7a1b47bd19d47)

Conflicts:
	api/pom.xml
TRUNK-4012 Improved installation script

(cherry picked from commit 8ff5bf0378f124860d01e27401fae889bb8fef51)

Conflicts:
	api/src/main/java/org/openmrs/notification/Note.java
	api/src/main/java/org/openmrs/util/PrivilegeConstants.java
TRUNK-4012 Exlcluded h2 from war by default

(cherry picked from commit 18f07521cb19c3aa948e2c38dafcfca9a4781be9)

Conflicts:
	api/pom.xml
	webapp/pom.xml
Fixed formatting
TRUNK-3960 Reload log4j.xml configuration without server restart (backporting f3de4b6b16c2fc6e7a45cb404a2e87dc912297b2)