TEIID-2611 TEIID-2504 ensuring forward compatibility of 8.3 and older
clients