ClusterHQ/flocker — pull request #629 by tomprince (2014-08-26 21:11:01+00:00)
Title: Fix tests in the presence of openssh's ControlMaster setting.

If it is enabled, a number of tests hang.