[6.1.x] Two backports#7983

bluetech merged 2 commits intopytest-dev:6.1.xpytest-dev/pytest:6.1.xfrom

bluetech:backportsbluetech/pytest:backportsCopy head branch name to clipboard