[FABRIC-877] ServiceLocator leaks ServiceListener
Merge pull request #724 from tdiesler/fab877

[FABRIC-877] ServiceLocator leaks ServiceListener