Improve the handling of errors during salt-ssh refresh of the thin client.
Fix salt-ssh handling of python os.execv
Handle sudo when re-deploying the shim
Fix salt-ssh highstate rendering
Add version of Master to manage.versions output.
salt-ssh 'grains' support for rosters and the master conf file
fix rbenv module UnboundLocalError
Add versionadded to new redis modules
Fix copy-paste
Merge pull request #14432 from thatch45/develop

Update develop
Merge pull request #14400 from panoptix-za/fix_salt_ssh_thinclient_refresh_handling

Improve the handling of errors during salt-ssh refresh of the thin clien...
Merge pull request #14403 from panoptix-za/fix_argv_handling_salt_ssh

Fix salt-ssh handling of python os.execv
Merge pull request #14408 from panoptix-za/fix_salt_ssh_thinclient_tmp_folder

Handle sudo when re-deploying the shim
Merge pull request #14421 from panoptix-za/fix_salt_ssh_thinclient_highstate

Fix salt-ssh highstate rendering
Merge pull request #14427 from panoptix-za/feature_add_grains_support_to_master_and_roster

Feature add grains support to master and roster
Merge pull request #14422 from eliasp/manage.versions-show-master-version

Add version of Master to manage.versions output.
Merge pull request #14428 from TiteiKo/fix-rbenv-module

fix rbenv module UnboundLocalError
Merge pull request #14431 from rallytime/fix_redis_versionadded

Add versionadded to new redis modules
Merge branch '2014.7' into develop