Merge branch '3.0.x' into 3.1.x

Closes gh-36630

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/client/RestTemplateBuilder.java

@@ -30,8 +30,6 @@
 import java.util.function.Function;
 import java.util.function.Supplier;
 
-import reactor.netty.http.client.HttpClientRequest;
-
 import org.springframework.beans.BeanUtils;
 import org.springframework.boot.ssl.SslBundle;
 import org.springframework.http.client.ClientHttpRequest;
@@ -399,7 +397,7 @@ this.errorHandler, new BasicAuthentication(username, password, charset), this.de
 
 	/**
 	 * Add a default header that will be set if not already present on the outgoing
-	 * {@link HttpClientRequest}.
+	 * {@link ClientHttpRequest}.
 	 * @param name the name of the header
 	 * @param values the header values
 	 * @return a new builder instance