Merge branch '1.9.x' of github.com:OpenHMIS/openmrs-core into 1.9.x

Conflicts:
	webapp/src/main/webapp/WEB-INF/template/headerFull.jsp
Fix to allow openmrs:require tag attribute value expressions.
Merge branch '1.9.x' of https://github.com/openmrs/openmrs-core into 1.9.x
Merge branch '1.9.x' of https://github.com/openmrs/openmrs-core into 1.9.x
TRUNK-3142: Made isValid to be more permissive
TRUNK-3944: Downgraded powermock and mockito due to OOM issues
TRUNK-3142: Fixed build for Oracle JDK 1.7 which is more permissive about locales
added transactional annotation back on notifyPrivilegeListener impl
temporarily ignoring a test in an attempt to fix broken bamboo build
reverting temporary testing changes in previous 2 commits
TRUNK-3944: Reverting back downgrade
Merge branch '1.9.x' of https://github.com/openmrs/openmrs-core into 1.9.x
Merged in latest changes from upstream 1.9.x branch.