Merge "Fix reference to nonexistent ssh_connect_method in config help"