[7.4.x] Fixes for typed pluggy#11355

nicoddemus merged 1 commit intopytest-dev:7.4.xpytest-dev/pytest:7.4.xfrom

bluetech:cherry-pick-11353bluetech/pytest:cherry-pick-11353Copy head branch name to clipboard