Accomodate grubport and grub2

Bug: 973092
Merge "Accomodate grubport and grub2" into release-0.13