v3007.7
Fix merge wart
Merge branch '3006.x-salt-priv' into merge/3007.x/3006.x-salt-priv
Merge branch '3006.x' into merge/3007.x/3006.x/2025-07-04
Fix scenarios merge wart
Merge branch '3006.x' into merge/3007.x/3006.x-25-08-27
Fix broken backport 64229 form master to 3006.x
Pyupgrade and drop six
Merge forward 3006.x into 3007.x