Refactoring in daemon/discovery.go Upstream-commit: 6f2c6111d42f823142fc26bc519417b82ffed56b Component: engine