fix pylint W1401 warnings in docstring
Merge pull request #5857 from hulu/anomalous-backslashes

fix pylint W1401 warnings in docstring
git_pillar: fix/cleanup imports

add missing imports
rm unused imports
rename local var to avoid shadowing
Merge pull request #5858 from hulu/git-pillar-import-fix

git_pillar: fix/cleanup imports
Docstring corrections/clarifications for rbenv state

The docstring should be recommending the use of "pkgs" rather than
"names". Also fixed a syntax error in the example, and added a
"versionadded" directive to better clarify the fact that this is a new
state, not available pre-0.16.0.
Updated arg to salt-key in minionswarm script
Merge pull request #5859 from whiteinge/ms-key-args

Updated arg to salt-key in minionswarm script
Merge pull request #5860 from terminalmage/docs

Docstring corrections/clarifications for rbenv state
Pillar.render_pstate: avoid mutable default argument value (pylint W0102)
Merge pull request #5861 from cvrebert/patch-1

Pillar.render_pstate: avoid mutable default argument value (pylint W0102)
Removed ellipses from docstring

Other fix would have been to set the encoding at the top. <shrugs>
Merge pull request #5862 from whiteinge/reclass-utfchar

Removed ellipses from docstring
Correctly process the iterator
Inherit correctly
script_retcode: use `stdin` arg; use kwargs due to quantity

************* Module salt.modules.cmdmod
W0613:722,8:script_retcode: Unused argument 'stdin'
Merge pull request #5863 from cvrebert/patch-1

script_retcode: use `stdin` arg; use kwargs due to quantity
tops.reclass_adapter: use "except X as Y:" syntax
Merge pull request #5864 from cvrebert/patch-2

tops.reclass_adapter: use "except X as Y:" syntax
properly format roster function string
deal with conf_file being a file nto a dir