CDI-399 OSGi headers, updated dependencies