tomcat5.5 -> tomcat6 (closes turnkeylinux/tracker#141)