Revert generics changes from r1613123
The code is compiled with Java 7, so why change them?
With recommended Eclipse settings those produce compiler warnings.
(Generic types/Redundant type arguments  warning)

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@1613897 13f79535-47bb-0310-9956-ffa450edef68