Incremental changes for Struts2x upgrade