tomcatKeystore script not needed with installer
Fixed broken logs
Added server.xml for import
Fixing bad merge
Merge branch 'development'