[koan] Remove root= argument from boot when using grubby and replace-self to avoid booting the currently running OS
Merge pull request #1153 from jmaas/release26

This should fix issue #638