PLAT-4705 - Manually fix improperly generated Joda beans