Fix for DEPLOY-44 and struts2 upgrade