fix a bunch of tests broken by cms-sw/cmssw#46582#46608

cmsbuild merged 1 commit intocms-sw:mastercms-sw/cmssw:masterfrom

mmusich:mm_fixes_post-46582mmusich/cmssw:mm_fixes_post-46582Copy head branch name to clipboard