Merge "Drop admin_role CONF dependency from cred provider"