OVERLORD-136 Fix deadlock with adding a service listener that is depende...

...nt upon other services retrieved via the service registry