builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.

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

builder: some small fixups + fix a bug where empty entrypoints would not override inheritance.