v3006.22
Multiple test fixes
Fix downgrade
Stabilize state queue tests and fix unit test JID type error
Test fixes
Fix broken backport 64229 form master to 3006.x
Pyupgrade and drop six
Enable lazy_loader_strict_matching in all test suites