TEIID-2608 misc. cleanups for odbc handling