Cleanup: refactor parsing and handling of Daemon config Upstream-commit: 13eb477b62b51d906fa88f508d2c560a2b4946aa Component: engine