Import fixes to grub2 from ports