[PLAT-3015] Update to ThreeTen
Merge remote-tracking branch 'origin/develop' into topic/PLAT-3015
Merge remote-tracking branch 'origin/topic/PLAT-3015' into develop