Merge remote-tracking branch 'upstream/main'

Author: nwoodward

duradmin/src/main/webapp/WEB-INF/web.xml

@@ -128,11 +128,11 @@
 
 
   <session-config>
-    <session-timeout>30</session-timeout>
+    <session-timeout>240</session-timeout>
   </session-config>
 
   <welcome-file-list>
     <welcome-file>index.jsp</welcome-file>
   </welcome-file-list>
 
-</web-app>
+</web-app>