Merge pull request #18793 from nmadhok/doc-fixes

Doc fixes
Merge branch 'develop' of https://github.com/saltstack/salt into doc-fixes