DeviceCatalog: refactoring of discovery and keepalive
ServiceCatalog: minor changes
ServiceRegistrator: fixed removing registration on shutdown