I'll leave it to your judgement as I need to delegate on OSGi matters but I hope the ServiceManager doesn't get too complex.
If it doesn't fit the role with minimal changes I'd rather maintain two different things, each one focused on doing its very specific thing in the best and simplest way.

I don't always love consicency :-)

![Consistency poster](http://demotivators.despair.com/demotivational/consistencydemotivator.jpg)