Cleanup cmd on entrypoint setting

Fixes #5147
If so, scratch that!  I didn't dig to see, but there very well could be,
but it feels like if there aren't, this is a pretty logical place to do so.