Teiid 2786 - applying updated to the commit based on recommendations

Teiid 2786 - applying updated to the commit based on recommendations