Merge with upstream, add transport config options back.
Fix config options
Merge pull request #9404 from techhat/nzbget

Moving nzbget module to salt-contrib
Merge pull request #9402 from gravyboat/develop

Typo fix in troubleshooting index, and more additions to master/minion troubleshooting.
Fix undefined variable
lint fixes for incron
whitespace
Fix lint errors in tests
Alias cmd.watch state to cmd.wait
Hide cmd.watch state alias from docs
Merge pull request #9406 from cro/salt_transport

Salt transport
Merge pull request #9408 from terminalmage/cmd-watch-alias

Alias cmd.watch to cmd.wait
Merge pull request #9407 from whiteinge/lit-docs

Add Sphinx directives for documenting YAML files
Add salt.transport to installed packages
Some fixes for transport merge

A few lint fixes and some variable assignment fixes
Fix config passing when master pillar is turned off
Clean out old salt_cloud directory

This was created to preserve the git history of salt cloud, now
that the files have been moved into place and the files have
preserved respective git history we can safely remove this directory
Start work on #8555

Load dynamic should also be stubbed out for salt-ssh, should prevent
ingecting the wrong grains
Remove docs references to nzbget

This module was recently removed to salt-contrib.
Fix line that was indented too far in code-block