TRUNK-4140 sqash changes in to one

refering pull req https://github.com/openmrs/openmrs-core/pull/842