Forward port  of CMSSW_7_2_X into CMSSW_7_3_X

As requested by @civanch #5643 is ignored in this forward port.