Save template refactoring
Merge branch 'pure-jetty' into save-tmpl-refact