Final grub prep updates

Last PR before https://github.com/coreos/scripts/pull/359