Builder - remove build settings after succesful import
Merge branch 'master' into templating

* master:
  Builder - remove build settings after succesful import
Setup - use templates for ssh config