Merge "Honour ssh_connect_method in test_baremetal_server_ops"