[FABRIC-874] Bootstrap completion not properly defined
[FABRIC-877] ServiceLocator leaks ServiceListener