Test for retcode
Fallback to grep-available for virtual pkg support
Reduce duplicated code
Fail with meaningful error message if python-apt isn't installed

This catches the CommandExecutionError raised when python-apt isn't
available and displays the error message as the comment in the return
data for the state.
add support for restart policy in docker.start module

restart policies have been introduced in docker 1.2.0
https://docs.docker.com/v1.2/#release-notes
add support for restart policy in docker.running state

restart policies have been introduced in docker 1.2.0
https://docs.docker.com/v1.2/#release-notes
The actual config option is ping_on_rotate
Merge pull request #16649 from basepi/ping_on

ping_on_rotate, not ping_on_key_rotate
Load __salt__ into wrappers for salt-ssh

Courage is not simply one of the virtues, but the form of every virtue
at the testing point.
- C. S. Lewis
Fix #16645
Adding TODO
Merge pull request #16653 from thatch45/heredoc

Fix #16645
Fix rand_thin dir system, it was broken in the heredoc PR
Proper handling of watch with onlyif/unless

This fixes #16647
Properly discover directories in s3fs file server.  Fixes #16638.

Also, remove the dirs_only parameter to _find_files in pillar s3,
because it doesn't work in some cases and isn't used anyway.
Merge pull request #16661 from thatch45/fix_rand_thin

Fix rand_thin dir system, it was broken in the heredoc PR
Merge pull request #16652 from cachedout/issue_16504

Load __salt__ into wrappers for salt-ssh
Merge pull request #16662 from rallytime/bp-16648

Backport #16648 to 2014.7
Merge pull request #16659 from etuttle/s3fs-dirs

Properly discover directories in s3fs file server.  Fixes #16638.
Merge branch 'retcode_failure_test' of https://github.com/cro/salt into cro-retcode_failure_test