Forward port CMSSW_7_2_X into CMSSW_7_3_X