TRUNK-4378 Add OpenmrsComponent annotation

(cherry picked from commit 7c13fb80212be503667d4608d50cc77f466fb44e)

Conflicts:
	api/src/test/java/org/openmrs/annotation/OpenmrsProfileExcludeFilterTest.java
TRUNK-4378 Modules using conditional loading should not fail on older versions

(cherry picked from commit adc56e8a12fa61b65c8437326fd15d03fdf98819)
(cherry picked from commit aecc9d6087dd35176a9b01f4ab1a992fdbff1832)
Revert "back porting to 1.9.x SchedulerUtil locks out openmrs user with false"

This reverts commit 44328feb93a8e38d0009e6f4c7556cf8aca90764.
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-4253 - PatientService.savePatient isn't threadsafe and can allow duplicate patient identifiers