[#1883] Upgrade to Joda Time 2.5
Merge pull request #808 from dddpaul/lighthouse-1883-patch

[#1883] Upgrade to Joda Time 2.5