OpenMRS.war doesn't deploy on Glassfish - TRUNK-3410
Conflicts:

	webapp/src/main/webapp/WEB-INF/web.xml
Followup commit to fix bad merge for TRUNK-3410
https://tickets.openmrs.org/browse/TRUNK-3410
Revert "Followup commit to fix bad merge for TRUNK-3410"

This reverts commit 3940f04989ae7bb7a5d9dec40017b575c2066988.
Revert "OpenMRS.war doesn't deploy on Glassfish - TRUNK-3410"

This reverts commit edf5f9414989c9dd1001015d24c5fce0b6ed2b70.
manually backporting OpenMRS.war doesn't deploy on Glassfish - TRUNK-3410
formatting
TRUNK-3744: Unable to delete global properties in 1.9.x+
TRUNK-3749 - Backport some new features in the Order data model to 1.9.x
backporting: Can't save concepts with two new concept reference terms
https://tickets.openmrs.org/browse/TRUNK-3745
and
https://tickets.openmrs.org/browse/META-261
Added @since to ConceptReferenceTerm - followup to TRUNK-3745
https://tickets.openmrs.org/browse/TRUNK-3745
Backporting: Abstracted out the access to fetch the implementation id so that the tests pass
Backporting: Applying Ben's code review comments to Zabil's changes from a2e350f
TRUNK-238:Remove Audit Patient Identifiers function
Backported from https://github.com/openmrs/openmrs-core/commit/ec8a03a92af3c8cafecfc76a7bb3417d8b656fda
Fixed odd change to message set as a void reason when saving an obs -
TRUNK-3701
https://tickets.openmrs.org/browse/TRUNK-3701
TRUNK-3489:Deleted program workflows should not appear when adding
patient program
Allow refreshing of the initialization wizard final page - TRUNK-2022
Applied review comment - TRUNK-2022
Display the inherited roles when searching for users by role under User
Management - TRUNK-3717

Revisited users list to limit the number of displayed roles -
TRUNK-3717

Follow up to use css for inherited roles to be displayed in italics -
TRUNK-3717
Changed by information not updated when concept names/synonyms are
edited, added or removed - TRUNK-3337(cherry picked from commit d5c478a3a425d19ca75441ac78de64dd12ef3b6a)
TRUNK-3284: Improve the current locale choice for concept management
page
(cherry picked from commit 0029be04cc280e9a38a7d436ca3e61ce0731458b)

Resolved conflicts:

	webapp/src/main/webapp/openmrs.css