[lorax/rhel7 3/3] Set UEFI defaults to match BIOS (#1021451, #1021446)