Add osgi service metadata to the manifests
Fix missing import (actually not needed)