Moving some more methods away from daemon.go Upstream-commit: c0501025368544a64060da431a270d8f954b7e98 Component: engine