updates for CMSSW_7
updates for CMSSW_7