[weld-issues] [JBoss JIRA] (CDITCK-622) Backport fix for CDITCK-597 to 1.2 branch