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