Merge "Fix cleanup of resources for object_storage tests"