sync with master#7063

chunjiez merged 11 commits into

feature/uefi_expiryxapi-project/xen-api:feature/uefi_expiryfrom

private/chunjiez/uefi_expiryxapi-project/xen-api:private/chunjiez/uefi_expiryCopy head branch name to clipboard