Fix tests in the presence of openssh's ControlMaster setting.
Fix copy-pasta.
Merge pull request #629 from ClusterHQ/disable-control-master

Fix tests in the presence of openssh's ControlMaster setting.