Make sure we pass proxy info wherever it is needed

We were not always passing proxy info in a form that was useful when ssh'ing from node to node.