Fix regressions in kickstart => autoinstall renaming

Also, delete merge files added by accident previously.
Merge pull request #1314 from alanoe/alanoe/rename_kickstart2

Fix regressions in kickstart => autoinstall renaming