Slhc7 cand2

Changes requested for CMSSW_6_1_2_SLHC7