Fix API wrt recent RFC changes, add some missing bits, remove parts of the older PaxCdi api which have equivalent in the new OSGi api