upstream changes related to syslinux6