Refactor kickstart validation logic.
Merge pull request #1126 from jmaas/master

Refactor kickstart validation logic.