Tomcat upgrade + Conf tweaks