- Removed typo in CachedPeerGroup
- Improved IoC in Discovery service, CMKeyStoreManager and Discovery
- Removed warnings in DiscoveryServiceImpl and replaced deprecated code