Changed install script to install Apache Tomcat 6.0.39
Resolve merge conflict