Cleanup of IServiceDefinition
Cleanup of osgi tests