Merge "Remove support for duplicate file entries." into jb-dev