Upgrade Struts2 version
Merge branch 'develop' into develop-apifilebrowser