MULE-6748.  Some further teaks to handle time zones (almost exclusively tests)