This PR updates the logic for using `--changed-files` so the combined fileset no longer has additional (left-over) entries. This fixes #6529