v3008.2
Merge branch '3007.x' into merge/3007.x/3008.x-26-04-30
Account for psutil upgrade
Forward-port issue-69402 fixes to 3008.x
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