Merge pull request #12107 from TravisPaul/devel

Update "smart" transport to handle Sun_SSH_1.5 on SmartOS

lib/ansible/executor/task_executor.py

@@ -452,7 +452,7 @@ class TaskExecutor:
                 try:
                     cmd = subprocess.Popen(['ssh','-o','ControlPersist'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
                     (out, err) = cmd.communicate()
-                    if "Bad configuration option" in err:
+                    if "Bad configuration option" in err or "Usage:" in err:
                         conn_type = "paramiko"
                 except OSError:
                     conn_type = "paramiko"