improve file.recurse performance
strip '/' from the prefix beginning and end to sanatize input, os.path.join quirk
document new prefix flag
Typo, white-space, PEP8 and formatting fixes.
Merge branch 'develop' of github.com:saltstack/salt into hotfix/modjk-formatting
Renamed the `lb` argument to `lbn` which is accepted by the style guide enforced by pylint.
Merge pull request #6676 from terminalmage/docs

Add versionadded for new grains functions
Merge pull request #6673 from s0undt3ch/hotfix/modjk-formatting

Typo, white-space, PEP8 and formatting fixes.
Add `versionadded` to the new `saltversioninfo` grain.
Merge pull request #6678 from s0undt3ch/develop

Add `versionadded` to the new `saltversioninfo` grain.
Added space
Do not include kwargs and other irrelevant fields in new_job event data
Merge pull request #6680 from SmithSamuelM/develop

Remove kwargs and other fields from new_job event
Re-import collections inside of yumpkg5._parse_pkginfo, Fix #6677
Merge pull request #6681 from basepi/pkgresource6677

Re-import collections inside of yumpkg5._parse_pkginfo, Fix #6677
minor whitespace cleaning
updated doc to include nested dictionary example to grains.setval
Add opts_pkg
spaces not tabs!
Merge pull request #6682 from mike-ainsworth/develop

add multi-level dict example to grains.setval
Allow deploy in ssh function wrapper