master
Migrate `unit.setup` to PyTest
tests: preserve environment merge logic in VirtualEnv.run
Fix setup scenario test environment and skip man pages if missing
Merge branch '3007.x' into merge/3007.x/3008.x/25-05-26