Merge "Stop using resource_cleanup in identity_v2 tests"