Merge branch '1.4.x' into 1.5.x

Author: snicoll

spring-boot-docs/src/main/asciidoc/howto.adoc

@@ -3203,12 +3203,12 @@ but the rest of it is normal for a Spring application in Servlet 2.5. Example:
 		</listener>
 
 		<filter>
-			<filter-name>metricFilter</filter-name>
+			<filter-name>metricsFilter</filter-name>
 			<filter-class>org.springframework.web.filter.DelegatingFilterProxy</filter-class>
 		</filter>
 
 		<filter-mapping>
-			<filter-name>metricFilter</filter-name>
+			<filter-name>metricsFilter</filter-name>
 			<url-pattern>/*</url-pattern>
 		</filter-mapping>