Partially reverts: WW-3623 some generics fix - to solve WW-4142

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