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
Unsafe argument
Merge pull request #17057 from basepi/mergeforward

Merge 2014.7 into develop
salt-call usage of RaetChannel also needs to go to master that motivated the call
Fixed
Revert salt-call usage change for RAETChannel as it didn't fix completely and normal targeting was wonky
Reinstate salt-call RAETChannel dst
Merge remote-tracking branch 'upstream/develop' into sam_dev1
Merge pull request #17058 from SmithSamuelM/sam_dev1

Better support (but not complete) for Mult-Masters on Salt Raet
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 #17053 from hulu/assertion-shadowing

avoid shadowing in salt.modules.test.assertion
Merge pull request #17049 from terminalmage/quickfix

Fix nonsense language in error message
Updated win_ntp.py to catch the ValueError that would occur when
a windows machine is attached to a domain and not using NTP for
time
Quotations are not necessary when passing cmd arguments in as an array

- This also fixes the inability to clone mercurial repos on Ubuntu 12.04
log when we stop waiting for a service to stop

Leave some evidence of the failure for the ops folks.
Merge commit, resolve conflict
account for stop failures when restarting services

During restarts, only try to start the service if it successfully
stopped
lint fixes, specific pywintypes.com_error Exception handling
Merge commit, resolve conflict