Merge branch '3.4.x'

Closes gh-45334

Author: wilkinsona

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/context/ServletContextResourceFilePathResolver.java renamed to spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/servlet/context/ServletContextResourceFilePathResolver.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.web.context;
+package org.springframework.boot.web.servlet.context;
 
 import org.springframework.boot.io.ApplicationResourceLoader;
 import org.springframework.boot.io.ApplicationResourceLoader.FilePathResolver;

spring-boot-project/spring-boot/src/main/resources/META-INF/spring.factories

@@ -111,5 +111,5 @@ org.springframework.boot.io.Base64ProtocolResolver
 # Resource File Path Resolvers
 org.springframework.boot.io.ApplicationResourceLoader$FilePathResolver=\
 org.springframework.boot.io.ClassPathResourceFilePathResolver,\
-org.springframework.boot.web.context.ServletContextResourceFilePathResolver,\
-org.springframework.boot.web.reactive.context.FilteredReactiveWebContextResourceFilePathResolver
+org.springframework.boot.web.reactive.context.FilteredReactiveWebContextResourceFilePathResolver,\
+org.springframework.boot.web.servlet.context.ServletContextResourceFilePathResolver

spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/context/ServletContextResourceFilePathResolverIntegrationTests.java renamed to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/servlet/context/ServletContextResourceFilePathResolverIntegrationTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.web.context;
+package org.springframework.boot.web.servlet.context;
 
 import java.io.File;