Merge "standardize ssh auth"