Fix generics warnings triggered by upgrade to Tomcat 7.0.55

See changes made in revision 1602507 [1]

[1] https://svn.apache.org/viewvc?view=revision&revision=1602507
Merge branch '1.1.x'