Revert "don't wait on the control socket. This might introduce a race, on the...

Revert "don't wait on the control socket. This might introduce a race, on the other hand I've been experiencing hangs"

This reverts commit 21772750.

tes/sshwrapper/__init__.py

@@ -94,11 +94,11 @@ class Ssh:
             env['SSH_AUTH_SOCK'] = sess.socket
             logger.debug("socket not found, starting new master")
             ctrl_p = subprocess.Popen(sshcmd,
-                                      stdout=None, stderr=None,
+                                      stdout=subprocess.PIPE, stderr=subprocess.PIPE,
                                       stdin=None,
                                       env=env)
             logger.debug("master spawned, attempt communicate")
-            #stdout, stderr = ctrl_p.communicate()
+            stdout, stderr = ctrl_p.communicate()
             logger.debug('communicate on the control port complete')
 
             sess.pids.append(ctrl_p.pid)