[teiid-dev] merging between 8.8 and 8.7.x