Fix a bug creating the glabel on the EFI boot partition
Merge remote-tracking branch 'upstream/master'