Making changes for CMSSW_7_*