Cleans up code, removes usage of ActionContext directly, uses @Inject instead

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