Add support for non-pc boot code location for grub2(bnc#866912,bnc#868909)