Add jetty.hostname to template cfg
Misc fixes and reformatting