UHM-1386 - Fixing unit test broken when fixing Hospitalization export length of stay calculation
Revert "UHM-1386 - Fixing unit test broken when fixing Hospitalization export length of stay calculation"

I accidentally committed the wrong thing (openmrs/openmrs-core instead of PIH/mirebalaisreports)

This reverts commit 80dd31605646ae58ed3fbee5cab3cae1fc7ef26b.
TRUNK-4373 Maven war plugin WebappStructure error

(cherry picked from commit c772ec2b68f394c5779cc8ac6771ae49ce08fa12)
TRUNK-287 ConceptService needs to strip trailing whitespace before searching or saving concept names

(cherry picked from commit 6a8020e7b74b19788d55bd4ffac34e6c4bfea611)
[maven-release-plugin] prepare release 1.9.8
[maven-release-plugin] prepare for next development iteration
Back ported TRUNK-3586 Update unit testing environment to use mocks

(cherry picked from commit 6ca3d0b488cdb88a150e79a7baf63e594a46a261)

Conflicts:
	api/src/test/java/org/openmrs/module/ModuleUtilTest.java
	web/src/main/java/org/openmrs/web/Listener.java
TRUNK-4280 | Changed the date format in getValueAsString() method of Obs class to get date in yyyy-MM-dd format
Merge pull request #1017 from Bhamni/1.9.x

TRUNK-4280 | Changed the date format in getValueAsString() method of Obs...
TRUNK-4238: OpenmrsUtil.storeProperties should escape backslashes
Merge pull request #1027 from pmuchowski/TRUNK-4238

TRUNK-4238: OpenmrsUtil.storeProperties should escape backslashes
TRUNK-4238 Added missing test
TRUNK-2671 Cache handlers in HandlerUtil

(cherry picked from commit cc3748cf53b5415a4ffd7d8a8a5060c4baf41fc6)

Conflicts:
	api/src/main/java/org/openmrs/util/OpenmrsConstants.java
TRUNK-4495 Settings page returns 500

(cherry picked from commit cffe985c9dce9933a2978ecf137d5c2a8b17eed3)
TRUNK-3826: Bug in PersonAttribute.compareTo

Follow to Bug in PersonAttribute.compareTo - TRUNK-3826

Conflicts:
	api/src/main/java/org/openmrs/PersonAttribute.java
TRUNK-4350: OpenmrsClassLoader may chose wrong ModuleClassLoader when one module name is a substring of another module name and there is a period in the name
(cherry picked from commit 9534cdb4feebf764e4c9501342369ad62bf1b45b)
ConceptService.getDrug(String) needs to be case insensitive - TRUNK-4404
TRUNK-3963: Visit validator should prevent or allow overlapping of visits depending on global property

Conflicts:
	api/src/main/java/org/openmrs/util/OpenmrsConstants.java
	api/src/test/java/org/openmrs/api/db/PatientDAOTest.java
	api/src/test/java/org/openmrs/api/db/hibernate/PatientSearchCriteriaTest.java
	api/src/test/java/org/openmrs/util/GlobalPropertiesTestHelper.java

Fixing failing tests for: Visit validator should prevent or allow
overlapping of visits depending on global property - TRUNK-3963
Conflicts:
	api/src/test/java/org/openmrs/validator/VisitValidatorTest.java

Putting back commented out code at: Visit validator should prevent or
allow overlapping of visits depending on global property - TRUNK-3963
Conflicts:
	api/src/main/java/org/openmrs/util/OpenmrsConstants.java

TRUNK-3963: Missing messages added

TRUNK-3963: Visit validator should prevent or allow overlapping of visits depending on global property

Conflicts:
	api/src/main/java/org/openmrs/util/OpenmrsConstants.java
Merge pull request #1215 from pmuchowski/TRUNK-3963-1.9.x

TRUNK-3963: Visit validator should prevent or allow overlapping of visit...
Putting back commented out code at: Visit validator should prevent or
allow overlapping of visits depending on global property - TRUNK-3963
Conflicts:
	api/src/main/java/org/openmrs/util/OpenmrsConstants.java