WELD-1682 Make CDI.current() work in multi-module SE deployments
WELD-1661 Remove dead code
Minor