Forward port IB/CMSSW_7_0_X/stable into IB/CMSSW_7_0_X/devel