TRUNK-3847(cherry picked from commit 07316639d4c52fd8c2935f6733afdf6f3a3079b9)
TRUNK-3853 and TRUNK-3414
(cherry picked from commit a1230a73ea3f22b2477451eee7fe7987a10a2ed2)
DrugOrderValidator should allow a drug order with either a concept or
drug - TRUNK-3008
Conflicts:
	api/src/main/java/org/openmrs/validator/DrugOrderValidator.java
Back ported, Encounter.patientId should be deprecated as it leads to
consistency problems - TRUNK-3769
Patient search don't work on IE8 - TRUNK-3817
Removed loading of module specific log4j configuration files
Backporting TRUNK-3851 - Modules should be able to define message codes outside of their module's namespace
TRUNK-3867: getPatientIdentifiers(String identifier, List<PatientIdentifierType> patientIdentifierTypes, List<Location> locations, List<Patient> patients, Boolean isPreferred) does not restrict by location
backport to 1.9.x
TRUNK-3851 - removing some commented code
Missing Validators for relationship_type - TRUNK-3814

made some changes
Applied auto fromat changes
backporting TRUNK-3741 - Missing Manage HL7Messages and Purge HL7 Messages privileges
TRUNK-3875: Upgrade xstream to 1.4.3
Attempting to save an alert without text should display a more user friendly error message - TRUNK-2975

added some changes

Cleaned up code in AlertValidator
Fix error message for visit attribute types - TRUNK-3230
UserContext should store locationId instead of the Location object - 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
Concept form and ConceptProposal form should use the same list of
locales - TRUNK-3828
TRUNK-3892: providerDAO.getProvidersByPerson(person, false) returns only retired providers, when it should return only *non-retired* providers
Retired concepts aren't showed as retired when listed as set members -
TRUNK-3840
Erroneous/Incomplete Validators for program - TRUNK-3816