Fix regressions in kernel configuration on x64.
Merge branch 'dev' of github.com:browndav/vm-toaster into dev