Merge "Add support for roles to credentials providers"