Merge pull request #9916 from Dentomologist/fileinfo_constructor_remove_duplication FileUtil: Remove duplication in FileInfo constructor