…ry exception when writing warnings to file

(cherry picked from commit 8b9b742)

…n invokin Encounter.addObs

(cherry picked from commit 41f320b)

…c036)

…9(cherry picked from commit 1b9b756)

encounter rows - TRUNK-2969

…1.9.x

(cherry picked from commit a1230a7)

drug - TRUNK-3008
Conflicts:
	api/src/main/java/org/openmrs/validator/DrugOrderValidator.java

consistency problems - TRUNK-3769

…es outside of their module's namespace

…tifierType> patientIdentifierTypes, List<Location> locations, List<Patient> patients, Boolean isPreferred) does not restrict by location

backport to 1.9.x

made some changes

…sages privileges

…riendly error message - TRUNK-2975

added some changes

Cleaned up code in AlertValidator

…TRUNK-3883

added some changes

applying auto commit changes

Fixed userContext.getLocation to return null when locationId is null -
TRUNK-3883

Added @SInCE and javadocs for getters and setters of
userContext.locationId - TRUNK-3883

locales - TRUNK-3828

…nly retired providers, when it should return only *non-retired* providers

TRUNK-3840

should void it - TRUNK-3445

TRUNK-4209: Fix N+1 select issues on Concept subentities

…f Obs is valueCoded

TRUNK-4164 Obs.getValueAsString(Locale locale) should localize name if O...

org.openmrs.validator.UserValidator.validate - TRUNK-4199

(cherry picked from commit 38120f1)

TRUNK-3974: ConceptNumeric(concept) incorrectly copies collections

…f the list

TRUNK-3898: Retired and hidden ConceptMapTypes should be at the end of the list

TRUNK-2658: Javascript errors on patient dashboard in firefox

… version

(cherry picked from commit a47d42e)

TRUNK-4025, backport liquibase fixes to 1.9.x

TRUNK-3909, backport edit_privileges liquibase changes

TRUNK-3850

This reverts commit 956e3f5.