Need Joda Time version 2.2 to satisfy another dependency. Passes portal-core maven tests
Merge remote-tracking branch 'upstream/master'