New changes to Trunk-2280.new

https://tickets.openmrs.org/browse/TRUNK-2280
The changes are made accordingly.