Merge "Support password-based ssh auth"