Update tomcat location to /etc/init.d version used in user installation instructions
Clean up formatting on configuration pages
Merge 1.9 changes into Head