[coreboot-gerrit] Patch merged into coreboot/master: efc6aa0 vboot2: Allow merging verstage into bootblock