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

@tiborvass @crosbymichael @vieux