Merge "test_server_rescue.py should use CONF.volume.volume_size"