Forward port timestamp fix to CMSSW_7_3
Merge pull request #6653 from mommsen/useValidTimeStampInAnyCase_73

Forward port timestamp fix to CMSSW_7_4