Fix some incomplete implementations
Fix support for Service Interfaces defined by OSGiService annotation specifying a specific implementation to use