Migrate osgi.core references