[teiid-designer-issues] [JBoss JIRA] (TEIIDDES-2229) Merge various fixes from master into 8.5.1