Allow `NonBlockingPopen` not to fail badly and also not to block on MS Windows. Fixes #5969.
Merge pull request #6032 from terminalmage/docs

Document defining custom grains in /etc/salt/grains
Do not specify "name" when using pip install --editable

This fixes #6025 by setting "name" to an empty string if the "editable"
param is used, like is already being done for the "requirements" param.
Merge pull request #6037 from terminalmage/issue6025

Do not specify "name" when using pip install --editable
Pass __env__ to salt.modules.pip._get_cached_requirements

This fixes #6003, and resolves a traceback caused by the environment not
being passed to the function.
Merge pull request #6043 from terminalmage/issue6003

Pass __env__ to salt.modules.pip._get_cached_requirements
Try to narrow down used fds. Refs #5878.
Fix mode in salt.modules.file.mkdir()

This removes the last remaining octal-specific code from the file
module. Fixes #6033.
Merge pull request #6046 from terminalmage/issue6033

Fix mode in salt.modules.file.mkdir()
Merge pull request #6044 from s0undt3ch/issues/5878-file-descriptors-leak

Try to narrow down used fds. Refs #5878.
Bring back the master state function
Refine the master state systems
Fix issue with cp.get_dir copying more than intended

The get_dir member function of the salt fileclient was doing a simple
check to see if the path of a target file (or empty dir) started with
the specified salt:// path. As a result, salt://foo would match files
like salt://foo.sh or files within the directory salt://foobar/.

This commit adds a check to ensure that these undesired files/dirs are
not considered a match by the fileclient, and thus do not get
copied/replicated on the minion.

Fixes #6048.
Merge pull request #6047 from s0undt3ch/issues/5969-windows-non-blocking-reads

Allow `NonBlockingPopen` not to fail badly and also not to block on MS Windows
Merge pull request #6050 from terminalmage/issue6048

Fix issue with cp.get_dir copying more than intended
Update state.load_dynamic to handle changes to saltutil.sync_all.
Merge pull request #6051 from faulkner/fix-load-dynamic

Update state.load_dynamic to handle changes to saltutil.sync_all.
Clarify docs on custom types