Factored in changes from first successful DVD install
Merge branch 'bugfix-d1-kickstart'