Merge pull request #1340 from jamezp/cdi-updates

Introduce CDI requirements for deprecated `@Context` injection