refactor use of container struct from daemon Upstream-commit: 32ead68e9f233ae809c8928a74700748c50fa3c0 Component: engine