PRO-46 - Fix round tripping of dates in XML