Merge "Make .ssh/config changes idempotent"