TRUNK-3405

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