Conflicts: container.go image.go Upstream-commit: 0cecc2a78c246a5b809954059650a4c22442e0d6 Component: engine