Merge branch '3.4.x' into 3.5.x

Closes gh-47145

Author: wilkinsona

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/RestClientWithRestTemplateBuilderTests.java renamed to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestClientWithRestTemplateBuilderTests.java

@@ -14,11 +14,10 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.test.autoconfigure.web.client;
+package org.springframework.boot.web.client;
 
 import org.junit.jupiter.api.Test;
 
-import org.springframework.boot.web.client.RestTemplateBuilder;
 import org.springframework.test.web.client.MockRestServiceServer;
 import org.springframework.web.client.RestClient;
 import org.springframework.web.client.RestClient.Builder;

spring-boot-project/spring-boot-test-autoconfigure/src/test/java/org/springframework/boot/test/autoconfigure/web/client/RestClientWithRestTemplateTests.java renamed to spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/client/RestClientWithRestTemplateTests.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package org.springframework.boot.test.autoconfigure.web.client;
+package org.springframework.boot.web.client;
 
 import org.junit.jupiter.api.Test;