CDI-399 Make cdi-api an OSGi bundle