Merge pull request #45233 from rallytime/merge-2017.7

[2017.7] Merge forward from 2016.11 to 2017.7

salt/modules/yumpkg.py

@@ -274,7 +274,7 @@ def _get_extra_options(**kwargs):
     ret = []
     kwargs = salt.utils.clean_kwargs(**kwargs)
     for key, value in six.iteritems(kwargs):
-        if isinstance(key, six.string_types):
+        if isinstance(value, six.string_types):
             ret.append('--{0}=\'{1}\''.format(key, value))
         elif value is True:
             ret.append('--{0}'.format(key))

tests/integration/files/conf/_ssh/sshd_config

@@ -54,4 +54,4 @@ AcceptEnv LANG LC_*
 
 Subsystem sftp /usr/lib/openssh/sftp-server
 
-#UsePAM yes
+UsePAM yes