MarshallException while trying to create an Encounter - TRUNK-4248
author:lluismf(cherry picked from commit c2fcd08f9a34e51ada6a2c0f11ccbbee59c996d7)