Webstart index template2

In addition to #2210 adding last two commits from #2239