v3008.1
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
Migrate package tests to the main test suite