grub2ext: clean code
Merge branch 'master' into dev_grub2ext