Merge branch '2015.8' into '2016.3'

Conflicts:
salt/config/__init__.py
salt/utils/parsers.py
tests/integration/__init__.py

salt/master.py

@@ -2302,7 +2302,7 @@ class ClearFuncs(object):
         # always write out to the master job caches
         try:
             fstr = '{0}.save_load'.format(self.opts['master_job_cache'])
-            self.mminion.returners[fstr](clear_load['jid'], clear_load)
+            self.mminion.returners[fstr](clear_load['jid'], clear_load, minions)
         except KeyError:
             log.critical(
                 'The specified returner used for the master job cache '

salt/modules/win_pkg.py

@@ -143,7 +143,7 @@ def list_upgrades(refresh=True, **kwargs):  # pylint: disable=W0613
     ret = {}
     for name, data in six.iteritems(get_repo_data().get('repo', {})):
         if version(name):
-            latest = latest_version(name)
+            latest = latest_version(name, refresh=False)
             if latest:
                 ret[name] = latest
     return ret

salt/utils/parsers.py

@@ -39,8 +39,6 @@ from salt.utils import kinds
 from salt.defaults import DEFAULT_TARGET_DELIM
 from salt.utils.validate.path import is_writeable
 import salt.exceptions
-
-# Import 3rd-party libs
 import salt.ext.six as six
 from salt.ext.six.moves import range  # pylint: disable=import-error,redefined-builtin
 

tests/integration/__init__.py

@@ -1234,7 +1234,7 @@ class ShellCase(AdaptedConfigurationTestCaseMixIn, ShellTestCase):
         except OSError:
             os.chdir(INTEGRATION_TEST_DIR)
 
-    def run_salt(self, arg_str, with_retcode=False, catch_stderr=False):
+    def run_salt(self, arg_str, with_retcode=False, catch_stderr=False, timeout=15):  # pylint: disable=W0221
         '''
         Execute salt
         '''