[teiid-commits] [teiid/teiid] de0f8c: TEIID-4480 correcting the merge