TRUNK-3943: Support data preserve on browser back button in concept search page
Merge branch 'master' of https://github.com/openmrs/openmrs-core
Merge branch 'master' of https://github.com/openmrs/openmrs-core
Merge branch 'master' of https://github.com/openmrs/openmrs-core
Merge branch 'master' of https://github.com/openmrs/openmrs-core
Merge branch 'master' of https://github.com/openmrs/openmrs-core
Merging wyclif's commit for ModuleFactory.startModuleInternal calling
itself recursively: Spring ApplicationContext is not able to be
refreshed properly through the API - TRUNK-204