[Merge] ~rafaeldtinoco/ubuntu/+source/grub2:lp1838525-eoan into ubuntu/+source/grub2:ubuntu/eoan-devel

[Rafael David Tinoco]

I have just rebased my changes to 2.04-1ubuntu10 since that version is the latest one (also submitted this same version to the PPA).
-- 
https://code.launchpad.net/~rafaeldtinoco/ubuntu/+source/grub2/+git/grub2/+merge/373792
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~rafaeldtinoco/ubuntu/+source/grub2:lp1838525-eoan into ubuntu/+source/grub2:ubuntu/eoan-devel.