Merge #4550 into CMSSW_7_1_X

Starting again with the forward port of CMSSW_7_0_X into CMSSW_7_1_X.