Upgrade Joda-Time 2.2, backport #1041