Trunk 4248  MarshallException while trying to create an Encounter

https://issues.openmrs.org/browse/TRUNK-4248