Device Catalog: updated memstorage tests
ServiceCatalog: refactoring of discovery and keepalive