Revert "Revert "Merge by hand 7_3_X into 7_3_ROOT6_X""
Merge pull request #6023 from cms-sw/revert-5991-revert-5988-merge-by-hand-73-into-73-root6

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