Ensure OSGi CDI works
24 files changed