Fixup commit for porting changes which entered CMSSW_7_1_0 into
CMSSW_7_2_X.