Tomcat 7 adjustments
merge from master