Allow other SaltStack projects to reuse `warn_until`.
Remove trailing white-space and some line wrapping.
Allow network related tests to be skipped if no network is available. Fixes #6710.
Merge pull request #6731 from s0undt3ch/develop

Remove trailing white-space and some line wrapping.
Finish the obfuscation work started on e58e895.
Merge pull request #6737 from s0undt3ch/hotfix/6710-skip-network-tests

Allow network related tests to be skipped if no network is available
Merge pull request #6736 from s0undt3ch/features/reusable-warn-until

Allow other SaltStack projects to reuse `warn_until`.
Clarify the minion ID generation docs
Merge pull request #6738 from terminalmage/walkthrough-fix

Clarify the minion ID generation docs
Fix FTP authentication in the salt fileclient

4f36393 inadvertently broke FTP authentication by stripping the username
and password from URIs and trying to use an HTTP authenticator. This
commit restricts that behavior to http(s) URIs. Fixes #6733.
Added 'success' field to successful runner return events
Merge remote-tracking branch 'upstream/develop' into develop

Conflicts:
	salt/runner.py
Prefix runner fun with 'runner' so round trip symmetric with api interface
Merge pull request #6743 from SmithSamuelM/develop

Added 'success' field to successful runner return events
Merge pull request #6742 from terminalmage/issue6733

Fix FTP authentication in the salt fileclient
Added param docs to grains.filter_by
Improved grains.filter_by usage example with multiple lookups
Added flag to allow overriding the grains.filter_by dict with Pillar