ARQ-1448 Add CDI.current() support