[#1883] Upgrade to Joda Time 2.5