Switch from o.e.osgi.services to org.osgi.service.component.annotations

Switch from o.e.osgi.services to org.osgi.service.component.annotations #426