Forward port timestamp fix to CMSSW_7_3