TEIIDDES-1575 Changes required for Teiid Importer