Forward port IB/CMSSW_7_1_X/stable into IB/CMSSW_7_1_X/next