TEIID-2770 ensuring roles are added appropriately