Trunk 2119

Link to ticket https://tickets.openmrs.org/browse/TRUNK-2119