[4.6] Handle xfail(strict=True) properly in --step-wise mode (#5555)#5556

nicoddemus merged 2 commits intopytest-dev:4.6-maintenancepytest-dev/pytest:4.6-maintenancefrom

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