Merge "Skip test_server_rescue with volumes when there is no Cinder"