Merge "Stop volume leaking test_server_rescue_negative"