Resolve rebase conflicts

lib/ansible/playbook/__init__.py

@@ -325,7 +325,7 @@ class PlayBook(object):
             private_key_file=self.private_key_file,
             setup_cache=self.SETUP_CACHE,
             basedir=task.play.basedir,
-            conditional=task.only_if,
+            conditional=task.when,
             callbacks=self.runner_callbacks,
             sudo=task.sudo,
             sudo_user=task.sudo_user,

lib/ansible/runner/connection_plugins/ssh.py

@@ -229,7 +229,7 @@ class Connection(object):
                 if p.stderr in rfd:
                     chunk = p.stderr.read()
                     if not chunk:
-                        raise errors.AnsibleError('ssh connection closed waiting for sudo password prompt')
+                        raise errors.AnsibleError('ssh connection closed waiting for sudo or su password prompt')
                     sudo_errput += chunk
                     incorrect_password = gettext.dgettext(
                         "sudo", "Sorry, try again.")