Merge "Use separate config entries for default role holders."