[teiid-commits] [teiid/teiid] bddafb: TEIID-4608 backport