Revert "Revert "Merge by hand 7_3_X into 7_3_ROOT6_X""

Reverts cms-sw/cmssw#5991