Merge "Remove resource_cleanup from test_object_version"