[weld-issues] [JBoss JIRA] (WELD-1806) Backport WELD-1787 to 2.2