Merge "Migrate to override_role for compute module (part 2)"