Merge branch 'develop' of https://github.com/saltstack/salt into develop
Merge branch 'develop' of https://github.com/saltstack/salt into develop
Added initial slot support to ebuild functions

Added slot support for ebuild.install, ebuild.update, ebuild.remove,
ebuild.purge
move documenatation generation to bottom

Installing Salt is required for auto-generated
module documentation.  Also mentioned about Sphinx
installation using pip.
Add param persist to states.kmod
Merge branch 'develop' of https://github.com/saltstack/salt into develop
fix #3403
Merge pull request #3408 from 0xDEC0DE/develop

Add a "manage.status" runner that gives a combined up/down report
Conform with the dict return type for 'salt.modules.grains.item'.
One more `grain.item` fix to comply with new dict output.
Fix supervisor test.
Merge pull request #3413 from s0undt3ch/develop

Fix tests.
Merge pull request #3392 from shadowfax-chc/ebuild-improv2

Added initial slot support to ebuild functions
Merge pull request #3400 from viktorkrivak/develop

Add param persist to states.kmod
minor formatting change
Merge pull request #3399 from baijum/doc

move documenatation generation to bottom
Merge pull request #3404 from giantlock/develop

fix #3403
PEP8 fixes from PyLint
Extend pillar matcher to traverse nested dicts
Extend grains matcher to traverse nested dicts