[teiid-issues] [JBoss JIRA] Updated: (TEIID-1026) Refine plan/annotation logic