Merge pull request #8744 from erikh/empty_entrypoint_inheritance

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