WW-4152 Solves problem with NPE as a side effect of concurrency issue, removes old code, use simpler dependency graph

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