Created a separate branch and a separate pull request for this.

https://github.com/openmrs/openmrs-core/pull/638