[java-sig-commits] [tomcat: 40/66] Fixes according to guidelines