merge with upstream
Merge branch 'grub2' of github.com:tsoome/illumos-gate into grub2