[teiid-commits] [teiid/teiid] 136477: TEIID-4468 backport