Merge "ssh: Add proxy support"