Merge daemon_unit_test.go to daemon_test.go Upstream-commit: 0bab97fcba8d2b4be1650fef381926e6b0259cc5 Component: engine