TRUNK-2498: Validate email address in user options page fixed
Merge branch '1.8.x' of https://github.com/harshadura/openmrs-core into TRUNK-2498