TRUNK-3910 Resolved. Please review

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