builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON Upstream-commit: 55702ae3d6f0d09efc466134e62be909fd38d777 Component: engine