Merge "Split resource_setup for object_storage tests"