Merge "Change "admin" literal for admin role to CONF admin_role"