Merge branch 'efi/queue' into 'master'

A couple EFI fixes

See merge request kvm-unit-tests/kvm-unit-tests!55