Merge "boot_signer should support boot header version 2"