[6.2.x] Missing backports to fix CI#9042

nicoddemus merged 3 commits intopytest-dev:6.2.xpytest-dev/pytest:6.2.xfrom

nicoddemus:backport-9040nicoddemus/pytest:backport-9040Copy head branch name to clipboard