Forward port CMSSW_7_0_X into CMSSW_7_1_X