Merge "Update tomcat to 8.5"