Merge "Migrate object_storage API tests to resource_* fixtures"