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

[Julian Andres Klode]

This goes into signed grub image and is needed for OEM work.
-- 
https://code.launchpad.net/~juliank/grub/+git/ubuntu/+merge/380548
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.