Merge pull request #17037 from rallytime/bp-16932

Backport #16932 to 2014.7
Merge pull request #17039 from terminalmage/issue17017

Fix state.sls_id
Clarifying documention for smtp module.
Nicer error message on service state when you watch enable/disable
Merge pull request #17043 from garethgreenaway/16929_2014_7

Minor fix to smtp module
Remove extra lines
Merge pull request #17045 from rallytime/fix_pylint

Remove extra lines
Use salt.utils.is_darwin() for __virtual__ in osxdesktop module
Merge pull request #17044 from jacksontj/2014.7

Nicer error message on service state when you watch enable/disable
Fix nonsense language in error message
reword docstring
add virtual function
don't load on windows
Merge pull request #17048 from terminalmage/osxdestkop-virtual

Use salt.utils.is_darwin() for __virtual__ in osxdesktop module
Fix for #17051
Add regression test for #17051
Add "normalize_ret" function, so we don't have to copy/paste so much

Add checks for "changes" since we want to test cases where there aren't changes to be made
Update nssm to 2.24
Merge pull request #17059 from cro/nssm_update

Update nssm to latest 2.24 (2014-08-31 release)
Merge pull request #17049 from terminalmage/quickfix

Fix nonsense language in error message