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

[Mate Kukri]

The proposal to merge ~mkukri/grub:ubuntu into ~ubuntu-core-dev/grub/+git/ubuntu:master has been updated.

Commit message changed to:

Rebase on top of grub2 2.12-1 from Debian sid.

Passed all automated, and some manual testing.

Also fixes the 'single recovery' issue.

For more details, see:
https://code.launchpad.net/~mkukri/grub/+git/grub/+merge/459698
-- 
Your team Ubuntu Core Development Team is subscribed to branch ~ubuntu-core-dev/grub/+git/ubuntu:master.