upstream changes related to syslinux6

changes from upstream to fix recent build failures