master
Port additional package and test build fixes for 3009.0
Account for psutil upgrade
Merge branch '3008.x' into merge/3008.x/master-26-06-18
Merge remote-tracking branch 'origin/3006.x' into merge/3007.x/3008.x-26-06-30
Migrate package tests to the main test suite
pkg conftest: resolve extras_pypath against installed onedir's Python