Fix daemon start/stop logic in hack/make/* scripts Upstream-commit: dcbf89d023c6578a50b13d9bad0f8f64722d6256 Component: engine