Pass through an explicit PROXY_SSH_USER.

Use user@user instead of user@hostname in case hostname is too long.

(cherry picked from commit abf1e768dc)

cluster/gce/configure-vm.sh

@@ -501,7 +501,7 @@ EOF
     cat <<EOF >>/etc/salt/minion.d/grains.conf
   cloud_config: /etc/gce.conf
   advertise_address: '${EXTERNAL_IP}'
-  proxy_ssh_user: '${INSTANCE_PREFIX}'
+  proxy_ssh_user: '${PROXY_SSH_USER}'
 EOF
   fi
 }