TEIID-2770 ensuring roles are added appropriately
TEIID-2770 back porting role import fix