Merge branch 'jk/maint-ls-files-other' into jk/fix-ls-files-other

* jk/maint-ls-files-other: refactor handling of "other" files in ls-files and status Conflicts: read-cache.c