Backport of #5714 to 72X

Backport of #5714 to 72X in order to start CMSSW_7_2_1