get the SLHC changes in the default branch
Merge remote branch 'origin/IB/CMSSW_7_0_X/stable' into IB/CMSSW_7_0_X/stable
Merge remote branch 'origin/IB/CMSSW_7_1_X/stable' into IB/CMSSW_7_0_X/stable