Revert "Merge remote branch 'cros/upstream' into autotest-rebase"

server/control_segments/cleanup

Index: server/control_segments/cleanup
diff --git a/server/control_segments/cleanup b/server/control_segments/cleanup
index 6ac67882c804b4815ab6fcd9c45ba24767232fb0..1a201bde62842b7caf82ff2ca7f4c673e702a97a 100644
--- a/server/control_segments/cleanup
+++ b/server/control_segments/cleanup
@@ -1,5 +1,8 @@
 def cleanup(machine):
-    host = hosts.create_host(machine, initialize=False, auto_monitor=False)
+    hostname, user, passwd, port = parse_machine(machine, ssh_user,
+                                                 ssh_port, ssh_pass)
+    host = hosts.create_host(hostname, user=user, port=port, initialize=False,
+                             password=passwd, auto_monitor=False)
     host.cleanup()