Add `sftp_file` function and prefer it over `scp_file`
Two spaces before in-line comment
Use the SSH option for port and not the CLI flag
file.accumulate exception fix

Don't iterate NoneType in file.accumulate. Return instead.

Refs #15334
add shell to global unless onlyif and check_cmd

Only pulls from grains and minion config.
shell should have been a string
self instead of salt
add shell to git and file unless and onlyif commands
Merge pull request #15574 from s0undt3ch/2014.7

[2014.7] Add `sftp_file` function and prefer it over `scp_file`
Merge pull request #15605 from cachedout/issue_15334

file.accumulate exception fix
Merge pull request #15626 from gtmanfred/2014.7

add shell option to global unless and onlyif
read in the key_no_rotate option
Add the cli option to key_no_rotate
Merge pull request #15632 from thatch45/key_no_rotate

Key no rotate
Add v2014.1.11 release notes
Merge pull request #15634 from basepi/2014.1.11releasenotes

Add v2014.1.11 release notes
Merge branch '2014.7' into develop

Conflicts:
	salt/utils/cloud.py