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