Added ubuntu support to grub timeout change.
Revert "Added ubuntu support to grub timeout change."

This reverts commit bb3add7108d52fc2a11f86d68eea000a78e9c71b.
Added ubuntu support to git timeout.
Merge branch 'grub2-timeout' into nicks-config