Merge "Cleanup: Add common "ssh-login server" method"