Fix CMSSW_7_1_X to CMSSW_7_2_X forward port.

This will include:

- #4306

and ignore:

- #4445

as requested by @Martin-Grunewald.