Updating the struts version
Merge branch 'dev/struts-fix' into generic