Use puppet to modify grub.conf
Merge branch 'grub-cfg'