TEIID-2786 additional changes to accomodate modeshape's driver