Cleanup: merge container-related jobs into daemon/ (Closes 7366) Upstream-commit: 867ffca84f3828d9d9a55d83bfe562cc221d0cc6 Component: engine