Merge pull request #15597 from rallytime/fix_digitalocean_tests

Change expected return for deleting digital ocean instance
Add new option connlimit related to CONNECTION LIMIT postgres option when create/update an user
FIX errors in docstring
Merge pull request #15625 from novapost/fix/postgres_wrong_functions_comments

FIX errors in docstring
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 branch '2014.7' into develop
Catch exceptions

Resolves #15887
Merge pull request #15568 from jacksontj/process_manage

Process manager
Merge pull request #15572 from jacksontj/saltnado

Updates to rest_tornado
Merge pull request #15574 from s0undt3ch/2014.7

[2014.7] Add `sftp_file` function and prefer it over `scp_file`
Merge pull request #15584 from makinacorpus/b3

Fix interactivity in aptpkg
Merge pull request #15588 from jacksontj/develop

Append JID to process name within salt-minion
Merge pull request #15602 from aletourneau/develop

Netscaler execution module
Merge pull request #15604 from cimarronm/log_user_dir_fix

Bugfix in logging to users directory
Merge pull request #15605 from cachedout/issue_15334

file.accumulate exception fix
Merge pull request #15606 from cimarronm/module_file_symlink_bugfix

Bug in file.symlink
Merge pull request #15607 from cimarronm/state_git_expanduser

Add expanduser to git target directories