[teiid-designer-issues] [JBoss JIRA] (TEIIDDES-2096) Merge 8.3.2 fixes into 8.5/master