Forward port CMSSW_7_1_X into CMSSW_7_2_X


Automatically ported from CMSSW_7_2_X #4573