Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Add force_reload for debian_service, upstart and systemd and use it as default in mod_watch if available
Remove unused import.
Merge branch 'develop' of github.com:saltstack/salt into develop
Merge branch 'develop' of github.com:saltstack/salt into develop
Switch `__grains__['os']` check with `salt.utils.is_windows()`
Fix PyLint C0103 on `salt.version`. Refs #1775.
Fix PyLint C0103 on `salt.state`. Refs #1775.
Fix PyLint C0103 on `salt.template`. Refs #1775.
Fix PyLint C0103 on `salt.payload`. Refs #1775.
Fix PyLint C0103 on `salt.log`. Refs #1775.
Fix PyLint C0103 on `salt._compat`. Refs #1775.
Fix PyLint C0103 on `salt.client`. Refs #1775.
Fix PyLint C0103 on `salt.config`. Refs #1775.
Fix PyLint C0103 on `salt.crypt`. Refs #1775.
Fix PyLint C0103 on `salt.minion`. Refs #1775.
Fix PyLint C0103 on `salt.master`. Refs #1775.