TEIIDES-2230: Updates for teiid client from teiid 8.7.x branch

* Changes diffed:
 * From: tag/teiid-parent-8.7.0.Final (db63eb2)
 * To:   8.7.x (ef65c7776c)
Merge pull request #405 from phantomjinx/master

TEIIDES-2230: Updates for teiid client from teiid 8.7.x branch