[Merge] ~juliank/grub/+git/ubuntu:ubuntu into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu

[Dimitri John Ledkov]

TODO test that latest entry points at the right kernel flavour in normal & zfs boots.
-- 
https://code.launchpad.net/~juliank/grub/+git/ubuntu/+merge/385358
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~juliank/grub/+git/ubuntu:ubuntu into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu.