FELIX-5043 Potential of waiting forever in ServiceRegistry.getService() This commit should fix the issue. I'll contribute a test in a separate commit.