Use the appropriate bastion host.

Change-Id: Ib0d90c9d7eae0428e14b6a92997fe7c6abe8c97a
Minor tweaks.

Change-Id: I89d8a548d91e960d521a5a09a70dd329efaf484e