Index: lams_admin/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_admin/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_admin/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
-	<context:component-scan base-package="org.lamsfoundation.lams.admin.web.controller" />
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
 	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
+	<context:component-scan base-package="org.lamsfoundation.lams.admin.web.controller" />
 </beans>
\ No newline at end of file
Index: lams_central/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_central/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_central/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -3,17 +3,20 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan
 		base-package="org.lamsfoundation.lams.web, org.lamsfoundation.lams.authoring, 
 		org.lamsfoundation.lams.workspace.web, org.lamsfoundation.lams.comments.web" />
-
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(.../commonContext.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -3,36 +3,14 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.0.xsd">
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd">
 
 	<!-- ========================= GENERAL DEFINITIONS ========================= -->
 
 	<import resource="messageContext.xml"/>
 
 	<!-- ========================= SPRING MVC GLOBAL BEANS ========================= -->
 	
-	<!-- This bean is used by DefaultAnnotationHandlerMapping bean in each LAMS module -->
-	<bean
-		class="org.lamsfoundation.lams.context.AnnotationMethodHandlerAdapter">
-		<property name="webBindingInitializer">
-			<bean
-				class="org.springframework.web.bind.support.ConfigurableWebBindingInitializer">
-			</bean>
-		</property>
-		<property name="messageConverters">
-			<list>
-				<bean
-					class="org.springframework.http.converter.ByteArrayHttpMessageConverter" />
-				<bean
-					class="org.springframework.http.converter.StringHttpMessageConverter" />
-				<bean
-					class="org.springframework.http.converter.FormHttpMessageConverter" />
-				<bean
-					class="org.springframework.http.converter.xml.SourceHttpMessageConverter" />
-			</list>
-		</property>
-	</bean>
-
 	<!-- This bean is used by MVC mechanism in each LAMS module -->
 	<bean
 		class="org.springframework.web.servlet.view.InternalResourceViewResolver">
Fisheye: Tag 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/AbstractUrlMethodNameResolver.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/AnnotationMethodHandlerAdapter.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/DefaultAnnotationHandlerMapping.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/HandlerMethodInvocationException.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/HandlerMethodInvoker.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/HandlerMethodResolver.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/InternalPathMethodNameResolver.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/MethodNameResolver.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/NoSuchRequestHandlingMethodException.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/ServletAnnotationMappingUtils.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/SourceHttpMessageConverter.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/WebUtils.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Fisheye: Tag 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/context/XmlAwareFormHttpMessageConverter.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_gradebook/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_gradebook/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_gradebook/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.gradebook.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_learning/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_learning/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_learning/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,19 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.learning.kumalive" />
 	<context:component-scan base-package="org.lamsfoundation.lams.learning.discussion.controller" />
 	<context:component-scan base-package="org.lamsfoundation.lams.learning.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_monitoring/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_monitoring/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_monitoring/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.monitoring.web" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_assessment/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_assessment/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_assessment/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -3,16 +3,19 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-   						   
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
-		
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan
 		base-package="org.lamsfoundation.lams.tool.assessment.web.controller" />
 </beans>
\ No newline at end of file
Index: lams_tool_bbb/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_bbb/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_bbb/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.bbb.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_chat/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_chat/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_chat/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.chat.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_daco/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_daco/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_daco/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.daco.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_dimdim/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_dimdim/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_dimdim/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.dimdim.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_doku/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_doku/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_doku/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.dokumaran.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_eadventure/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_eadventure/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_eadventure/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.eucm.lams.tool.eadventure.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_forum/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_forum/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_forum/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.forum.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_gmap/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_gmap/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_gmap/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.gmap.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_images/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_images/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_images/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.imageGallery.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_imscc/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_imscc/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_imscc/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.commonCartridge.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_kaltura/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_kaltura/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_kaltura/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.kaltura.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_lamc/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_lamc/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_lamc/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.mc.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_laqa/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_laqa/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_laqa/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.qa.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_larsrc/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_larsrc/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_larsrc/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.rsrc.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_leader/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_leader/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_leader/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.leaderselection.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_mindmap/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_mindmap/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_mindmap/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.mindmap.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_nb/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_nb/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_nb/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.noticeboard.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_notebook/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_notebook/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_notebook/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.notebook.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_pixlr/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_pixlr/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_pixlr/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.pixlr.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_preview/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_preview/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_preview/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.peerreview.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_sbmt/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_sbmt/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_sbmt/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.sbmt.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_scratchie/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_scratchie/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_scratchie/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.scratchie.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_scribe/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_scribe/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_scribe/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -3,15 +3,18 @@
 <beans xmlns="http://www.springframework.org/schema/beans"
 	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
 	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-   						   
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
-		
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.scribe.web.controller" />
 </beans>
\ No newline at end of file
Index: lams_tool_spreadsheet/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_spreadsheet/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_spreadsheet/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,16 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.spreadsheet.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_survey/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_survey/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_survey/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,18 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
 
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.survey.web.controller" />
-	
-   						   
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_task/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_task/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_task/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.taskList.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_videorecorder/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_videorecorder/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_videorecorder/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.videoRecorder.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_vote/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_vote/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_vote/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.vote.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_whiteboard/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_whiteboard/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_whiteboard/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.whiteboard.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_wiki/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_wiki/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_wiki/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.wiki.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_wookie/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_wookie/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_wookie/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.wookie.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file
Index: lams_tool_zoom/web/WEB-INF/spring-servlet.xml
===================================================================
diff -u -r7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2 -r7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4
--- lams_tool_zoom/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7d039f65ece5cc94cc6cd3694bbcef4fadcf62f2)
+++ lams_tool_zoom/web/WEB-INF/spring-servlet.xml	(.../spring-servlet.xml)	(revision 7ff6d4b34cd71ac45741cb7c8d0c3ef6909eadf4)
@@ -1,17 +1,20 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xmlns:context="http://www.springframework.org/schema/context"
-       xsi:schemaLocation="http://www.springframework.org/schema/beans
-           				   http://www.springframework.org/schema/beans/spring-beans-4.3.xsd
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:context="http://www.springframework.org/schema/context"
+	xmlns:mvc="http://www.springframework.org/schema/mvc"
+	xsi:schemaLocation="http://www.springframework.org/schema/beans
+           				   http://www.springframework.org/schema/beans/spring-beans.xsd
            				   http://www.springframework.org/schema/context 
-   						   http://www.springframework.org/schema/context/spring-context-4.3.xsd">
-	<!-- Spring MVC -->
+   						   http://www.springframework.org/schema/context/spring-context.xsd
+   						   http://www.springframework.org/schema/mvc
+        				   http://www.springframework.org/schema/mvc/spring-mvc.xsd">
+
+	<!-- Initialise Spring MVC. Enforce path suffix use otherwise /start will be recognised but /start.do will not. -->
+	<mvc:annotation-driven>
+		<mvc:path-matching suffix-pattern="true" />
+	</mvc:annotation-driven>
+
 	<context:component-scan base-package="org.lamsfoundation.lams.tool.zoom.web.controller" />
-	
-   	<!-- This bean initialises controller scanning. 
-   		 It was done automatically up to Spring 4, but had to manually reintroduced for Spring 5. -->		   
-	<bean
-		class="org.lamsfoundation.lams.context.DefaultAnnotationHandlerMapping" />
 </beans>
\ No newline at end of file