Cherry-pick from devel; tomcat version, fixes and ferret urls