merge test
Merge branch 'reco_12_02' of github.com:CmsHI/cmssw into reco_12_02
fj comment removed