Fix regressions in kickstart => autoinstall renaming

Also, delete merge files added by accident previously.