Fixing grant_option False being evaluated as a string and therefore True
Removed previous fix for grant_option False and am using salt.utils.is_true instead
Changed remaining 'if grant_option' to 'salt.utils.is_true(grant_option)'
added missing s
Merge pull request #7592 from s0undt3ch/hotfix/lint

Logs download should be done in a separate step.
Fix typos
Merge pull request #7593 from corywright/patch-1

Fix typos
Set and get a Windows machine's ntp servers
Merge pull request #7595 from UtahDave/develop

Set and get a Windows machine's ntp servers
A minor clarity fix for documentation regarding the extension of Salt.

I attempted to preserve what I believe to be the original intent of the author but please feel free not to merge these changes if you feel that I've failed in doing so. :]
Add note about salt-ssh package to salt-ssh docs
Merge pull request #7599 from basepi/sshdocs7579

Add note about salt-ssh package to salt-ssh docs
Merge pull request #7596 from cachedout/develop

A minor clarity fix for documentation regarding the extension of Salt.
Add note about top.sls to the "starting states" tutorial

Also cleaned up a bit of a redundancy, and removed a reference to a
section called "State Data Structures" which appears to no longer exist.
Merge pull request #7600 from terminalmage/docs

Add note about top.sls to the "starting states" tutorial
Merge pull request #7590 from llamallama/develop

Fixing grant_option False being evaluated as a string and therefore True
Support named salt versions
Let SaltStackVersion be the original one, not a MagicMock'ed one
Fix the warnings unit test.

Since the `warn_until` function now parses and instantiates a `SaltStackVersion`, the `bugfix` part of the version info is always shown.
Fix the `kwargs_warn_until` unit test case.