TEIID-2948: pulling in SimpleAttributeDefinition modifications from RBAC...

... check-in