Fix CDI API clash when running against Weld 2