WEB-126 some additional grammer cleanup and tomcat configuration cleanup