Revert "Initial set of fixes for newer Struts version"

This reverts commit d1790e635a84d6ad856886bd5f8f3f7962140f5f.

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