Merge "Improve volume_backed logic in create_test_server"