[CMSSW_7_0_X][48] Misc. changes