Forward port timestamp fix to CMSSW_7_3

Forward port timestamp fix from CMSSW_7_2 to CMSSW_7_3.