[teiid-commits] [teiid/teiid] 123dd6: TEIID-4926 backport (#961)