merged with mainline

diff --cc util/grub-install.in
Simple merge

diff --cc util/grub-mkconfig.in
Simple merge

diff --cc util/grub-mkrescue.in
Simple merge

diff --cc util/i386/efi/grub-install.in
Simple merge

diff --cc util/ieee1275/grub-install.in
Simple merge