Improve error message for conflicting container name. Upstream-commit: 034ba8b88fdcc3d5100ae0d2edc914673b15a2f4 Component: engine