Wizard: Sometimes preserve folders when folder config is skipped.

* When folder config is used, other folder definitions are always
  removed.
* Fix a bug with the wizard becoming stuck when 'skip folder config'
  is used.