Merge branch '3.5.x' into 4.0.x

Closes gh-50085

Author: wilkinsona

module/spring-boot-security/src/main/java/org/springframework/boot/security/autoconfigure/web/StaticResourceLocation.java

@@ -48,7 +48,8 @@ public enum StaticResourceLocation {
 	WEB_JARS("/webjars/**"),
 
 	/**
-	 * The {@code "favicon.ico"} resource.
+	 * The {@code "favicon.ico"} resource and resources matching
+	 * <code>"&sol;*&sol;icon-*"</code>.
 	 */
 	FAVICON("/favicon.*", "/*/icon-*"),