Merge "Stop using resource_cleanup in identity_v3 tests"