[master/f20-branch][PATCH] Do not write out the vconsole.keymap boot option (#1035316)