Begin fixing osgi metadata for maven build

Initial work toward re-enabling OSGi metadata generation in the new maven build.