OpenMRS crashes irrecoverably if particular errors occur during module loading  - TRUNK-2850
(cherry picked from commit 860a84e99e844792afc856b586dffb3f203b10a7)
Not started required modules error message should not include modules
that are already started - TRUNK-3999(cherry picked from commit b598f281edf6c17fd54ce83dacd9fcfe14516b77)
Retired Visit types should be available for selection on the New Visit form - TRUNK-3370
Retired Visit types should be available for selection on the New Visit form - TRUNK-3370
Applying auto format changes
TRUNK-3944: Responded to review comments
(cherry picked from commit 56c743b869668cef595160db7b6247c9d2c4bde8)
TRUNK-3944: Fixed the build (different dataset)
TRUNK-3944: Responded to more review comments
(cherry picked from commit bf40931d8fad0ef622106e267048787181270588)

Conflicts:
	api/src/test/java/org/openmrs/api/ConceptServiceTest.java
Delete other order stuff before deleting current order - TRUNK-3289
Added @since value to OrderService.purgeOrder(Order, boolean) - TRUNK-3289
Back porting to 1.9.x: Refactor InitializationFilter so that first-time
startup of OpenMRS behaves identically to normal startup - TRUNK-3998
Concept Map Types in the standard test dataset have the wrong uuids - TRUNK-3683
Fixed class comparison in ServiceContext and upated DataExportReportObject to properly check for a null location in generatePatientSet(EvaluationContext context) method - TRUNK-3959
TRUNK-3915 Resolved and successfully tested.
(cherry picked from commit cebb56d9a123a47ff420c0ade74239d2c3d8c426)
TRUNK-3915 Corrected back port
Revert "TRUNK-3915 Corrected back port"

This reverts commit 4764752200209a0329e77b20aa1ca372c5518ccc.
 Revert "TRUNK-3915 Resolved and successfully tested."

This reverts commit e0a7c2b8b950fe4687b666459232b00f2a486662.
TRUNK-3884 Relationships missing for encounter_provider table
(cherry picked from commit 0b227ca8e6a370b6488903953977f20dd777f7b1)
Applying auto format changes
TRUNK-3970: Fix NPE
(cherry picked from commit 96fb5b042328eb055ee3c66496f2937cad2dad9d)