builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON

Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Merge pull request #8809 from erikh/builder_cmd_sh_fix

builder: Restore /bin/sh handling in CMD when entrypoint is specified with JSON