Merge pull request #23262 from ffontaine/fix-squashfs-tools-cpeid