Trunk 3499

https://tickets.openmrs.org/browse/TRUNK-3986   [Support more CustomDatatypes and their associated CustomDatatypeHandlers]