Merge "Fix cleanup for object_storage tests"