[teiid-issues] [JBoss JIRA] Updated: (TEIID-308) Merge the query rewriter and expression evaluator visitor