Forward port timestamp fix to CMSSW_7_4

Add this fix to 7_4, too.