…7.x-25-08-28

Merge forward from 3006.x into 3007.x

…to merge/master/3007.x-25-08-28

…7.x-25-08-28

Merge forward 3007.x into master

Update requests to 2.23.5

…ter-25-11-19

The MSI packages build for pr, branch, and nightly tests create a
package version that can be interpreted as being equal to the released
version.

This stems from the way MSI package versions diverge from our offical
salt versions 3007.9 => 30.07.9

Merge forward 3007.x into master

Making sure the rest of our test suite passes with our changes

Convert remaining IOLoop calls to pure asyncio and remove the tornado
import.

We're getting rid of tornado.ioloop for any cases where we don't end up
calling tornado's IOLoop.run_sync method.

Use set_shared() helper to set grains on root OptsDict so all
child loaders can see grains. Previously grains were set on a
child's _local dict which was invisible to sibling children.

This fixes the same issue as the previous commit but for SSH
wrapper functions.

Adds the blockdev state module back - it had been removed as part of the
module migration, but being able to format filesystems is fairly core
functionality and the associated disk execution module is still in.

Fixes the check for non-blockdev devices, the "file.is_blkdev" function
wasn't being called correctly so would always be True. Added test to
cover functionality.

Fixes the tests to actually mock the function with a function rather
than a boolean.