Moved CDIContextExtension to own file to avoid incompatibilities