BZ-999974 - Added Teiid support