Merge branch '2014.7' into develop
Merge pull request #14433 from thatch45/develop

Merge up ssh fixes from 2014.7 to develop
Merge pull request #14236 from steverweber/fix_restarts

change minion auto restart to multiprocessing mode
Add CLI example to augeas.execute
Throw in a 'versionadded' as well
Factor out into a function the current number of PTY's detection code
UPdated SaltKeep loadRemoteData was missing
added dump parameter so keep.status
Lint fix
Merge pull request #14438 from thatch45/lint

Lint fix
Merge pull request #14436 from rallytime/fix_cli_examples

Add CLI Example to augeas.execute
Fixing a weird case where an empty job file will end up in the cachedir, causing exceptions when the minion is restarted.  This change removed the problem job file.
Revert "change minion auto restart to multiprocessing mode"
Merge pull request #14440 from saltstack/revert-14236-fix_restarts

Revert "change minion auto restart to multiprocessing mode"
Merge branch '2014.7' into develop
Merge pull request #14441 from thatch45/develop

Merge up Augeas fixes
begin ansible roster
should be a dictionary not a list
Use loader instead of variables
clean up matching