[teiid-commits] [teiid/teiid-documents] 5f7eaf: TEIID-4643 correcting merge