CMS-4317 Start using declarative services in OSGi.