Merge "Migrate to override_role for identity v2 module"