Fix cdi annotations on annotations
Upgrade the extension / extender and sample1 to the new OSGi api.
The extension is now always available to CDI bundles