Update OSGi exports to match latest packages
Merge pull request #2839 from mcculls/fix-osgi-exports

Update OSGi exports to match latest packages