zfsboot: sync grub with smartos-20130503T001121Z.

Change-Id: I10951cd4a3721f5752f85288f18d8d71df9d928c
Signed-off-by: Piotr Sikora <piotr.sikora@frickle.com>