Merge remote-tracking branch 'origin/develop' into develop

* origin/develop:
  The documentation for 'Developing Salt' is missing a critical step for 0.17+ users who wish to utilize the test runner. This commit describes the direct installation of salt-testing.
  -- Please review for accuracy prior to merge --
Refactor new win_ntp module

Use built in service management functions to handle starting/restarting
services.
Fix windows service.restart

Instead of doing weird sleep/recheck stuff, just use the existing
stop/start functions.
Make sure that state.sls/state.highstate cache files are not read-only

This fixes an error that occurs on Windows minions where default
permissions are inherited and files are created initially as read-only.
Fix windows service.status

Just looking for "PENDING" and considering the status as running is not
correct, because there is a STOP_PENDING and a START_PENDING.

Also fixed a possible race condition in stopping/starting a service,
where the service could still be in STOP_PENDING when salt attempts to
start it.
Add get_pending_computer_name function
Add new windows states to the docs
Add win_system state module
Alias get_computer_description to get_computer_desc
Add win_ntp module to docs
Fix system.set_computer_desc

This would always return that the description had been changed,
resulting in the corresponding state always thinking the change had been
successful. This commit fixes that behavior.
Alias set_computer_description to set_computer_desc
Suppress function aliases from appearing in docs
Remove inapplicable exclude-members directive
Add versionadded directives to new modules/states
ntp state: rm unused import
pillar.django_orm: fix misspelled function name
Add CLI examples to fix travis breakage
Merge pull request #7721 from cvrebert/patch-1

ntp state: rm unused import
Merge pull request #7722 from cvrebert/patch-2

pillar.django_orm: fix misspelled function name