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
Merge pull request #6749 from whiteinge/filter_by-override

Allow filter_by to be overridden by pillar values
Better logging in salt.utils.subdict_match
Support delimiter overrides for grains{,_pcre} and pillar matchers
Fix functions in match module

Likely due to some recent changes in the matchers, the
match.grains{,_pcre}, match.pillar, and match.ipcidr functions were
broken. This commit fixes them and also adds the ability to override the
delimiter in select functions. Additionally, the caught exceptions in this
module are now being logged instead of fading into the aether.
Fix versionchanged directives

I mistakenly neglected a space between the '..' and 'versionchanged'
Fix passing kwarg values '|' and '#'

Due to the fact that CLI kwargs for module execution functions are
passed through yaml.safe_load, certain values get mangled. This fixes
two such values. More commits like this may arise as other cases are
found. Fixes #6752.
Removed "ret' field unused from new_job_load
Merge pull request #6755 from SmithSamuelM/develop

Removed "ret' field unused from new_job_load
Merge pull request #6753 from terminalmage/issue6745

Fix functions in match module
Merge pull request #6754 from terminalmage/issue6752

Fix passing kwarg values '|' and '#'
Merge pull request #6744 from s0undt3ch/develop

Adapt the test case to the changes introduced in 7e9e889