Cleanup cmd on entrypoint setting

Fixes #5147
Wouldn't it make sense right here to test that our first image has both "entrypoint" _and_ "cmd" set, on top of the tests below that the second image "entrypoint" cancels out the "cmd" of the base image?