Initial commit for re-adding support for --bootloader=grub