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

[Julian Andres Klode]

Maybe I should open a FFe bug for this, but it's also a kind of bug fix?
-- 
https://code.launchpad.net/~juliank/grub/+git/ubuntu/+merge/381462
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~juliank/grub/+git/ubuntu:resilient-boot into ~ubuntu-core-dev/grub/+git/ubuntu:ubuntu.