Unify grub

Merged Philip Müller requested to merge unify_grub into master

Created by: udeved

Merge request reports