Initial set of fixes for newer Struts version

git-svn-id: https://svn.apache.org/repos/asf/continuum/branches/CONTINUUM-2713@1534886 13f79535-47bb-0310-9956-ffa450edef68