AS7-5842 Upgrading joda time to version 2.1

Version 2.x is source compatible with 1.6 (with the exception of deprecated methods removal) so it should be a simple version change. 

See http://joda-time.sourceforge.net/upgradeto200.html