Merge pull request #49500 from rallytime/merge-2018.3

[2018.3] Merge forward from 2017.7 to 2018.3

doc/topics/development/labels.rst

@@ -32,20 +32,9 @@ possible solution or implementation.
 
 - ``Blocked`` - The issue is waiting on actions by parties outside of
   SaltStack, such as receiving more information from the submitter or
-  resolution of an upstream issue.  This milestone is usually applied in
-  conjunction with the labels ``Info Needed``, ``Question``, ``Expected
-  Behavior``, ``Won't Fix For Now``, or ``Upstream Bug``.
-
-- ``Under Review`` - The issue is having further validation done by a SaltStack
-  engineer.
-
-- ``<Sprint>`` - The issue is being actively worked on by a SaltStack engineer.
-  Sprint milestones names are constructed from the chemical symbol of the next
-  release's codename and the number of sprints until that release is made.  For
-  example, if the next release codename is ``Neon`` and there are five sprints
-  until that release, the corresponding sprint milestone will be called ``Ne
-  5``.  See :ref:`here <version-numbers>` for a discussion of Salt's release
-  codenames.
+  resolution of an upstream issue. This milestone is usually applied in
+  conjunction with the labels ``Info Needed``, ``Question``,
+  ``Expected Behavior``, ``Won't Fix For Now``, or ``Upstream Bug``.
 
 Labels
 ======

salt/client/ssh/__init__.py

@@ -445,7 +445,7 @@ class SSH(object):
             if target.get('passwd', False) or self.opts['ssh_passwd']:
                 self._key_deploy_run(host, target, False)
             return ret
-        if (ret[host].get('stderr') or '').count('Permission denied'):
+        if ret[host].get('stderr', '').count('Permission denied'):
             target = self.targets[host]
             # permission denied, attempt to auto deploy ssh key
             print(('Permission denied for host {0}, do you want to deploy '

tests/integration/modules/test_cp.py

@@ -667,4 +667,4 @@ class CPModuleTest(ModuleCase):
             os.unlink(tgt_cache_file)
 
     def test_envs(self):
-        self.assertEqual(self.run_function('cp.envs'), ['base', 'prod'])
+        self.assertEqual(sorted(self.run_function('cp.envs')), sorted(['base', 'prod']))

tests/integration/modules/test_win_ntp.py

@@ -6,12 +6,13 @@ from __future__ import absolute_import
 # Import Salt Testing libs
 from tests.support.case import ModuleCase
 from tests.support.unit import skipIf
-from tests.support.helpers import destructiveTest
+from tests.support.helpers import destructiveTest, flaky
 
 # Import Salt Libs
 import salt.utils.platform
 
 
+@flaky
 @skipIf(not salt.utils.platform.is_windows(), 'Tests for only Windows')
 class NTPTest(ModuleCase):
     '''