Trunk-2280 - updated changes

https://tickets.openmrs.org/browse/TRUNK-2280