Merge branch '2014.7' into develop
Remove "never timeout" feature
Merge pull request #16058 from cro/macports_7br

Change find_changes to compare_dicts so macports will work
Somehow dropped the calls to salt.utils.compare_dicts
Add documentation.
Pylint fix.
Merge 2014.7 to develop
Merge pull request #16044 from rallytime/requisite_docs

Clarify unless and onlyif docs
Merge pull request #16001 from thatch45/ssh_fsclient

Ssh fsclient
Merge branch '2014.7' into develop
Merge branch 'develop' of https://github.com/saltstack/salt into parted_tests
Start ioflo docs
Renamed comps variable to cols for readability

I'm not sure what comps is short for, but this code is definitely doing
column-wise parsing.
Fix the ec2 cloud provider tests
Remove use of try/except for flow control

If the intent is to only extract the 7th column if it exists then it
makes more sense to actually test for the number of columns rather than
catch an IndexError which may occur at any of the 3 list index
operations within the try block.
Remove 'running' check - it's not reliable
Fix errors
Backport processmanager

Conflicts:

	salt/master.py
Basics working, can't handle restart of a master yet...
Handle failures of upstream masters