Merge branch '2.5.x' into 2.6.x

Closes gh-30033

spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/web/servlet/ServletWebServerFactoryAutoConfiguration.java

@@ -95,7 +95,6 @@ static class ForwardedHeaderFilterConfiguration {
 
 		@Bean
 		@ConditionalOnClass(name = "org.apache.catalina.startup.Tomcat")
-		@ConditionalOnMissingFilterBean(ForwardedHeaderFilter.class)
 		ForwardedHeaderFilterCustomizer tomcatForwardedHeaderFilterCustomizer(ServerProperties serverProperties) {
 			return (filter) -> filter.setRelativeRedirects(serverProperties.getTomcat().isUseRelativeRedirects());
 		}