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