[Merge] ~xnox/livecd-rootfs:fix-esp into livecd-rootfs:ubuntu/master

[Steve Langasek]

Review: Approve

LGTM.  Should also have CPC team sign-off before landing.
-- 
https://code.launchpad.net/~xnox/livecd-rootfs/+git/livecd-rootfs/+merge/396771
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~xnox/livecd-rootfs:fix-esp into livecd-rootfs:ubuntu/master.