Merge branch '2.1.x'

Closes gh-17762

Author: mbhave

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

@@ -154,7 +154,10 @@ public RestTemplateBuilder detectRequestFactory(boolean detectRequestFactory) {
 
 	/**
 	 * Set a root URL that should be applied to each request that starts with {@code '/'}.
-	 * See {@link RootUriTemplateHandler} for details.
+	 * Since this works by adding a {@link UriTemplateHandler} to the
+	 * {@link RestTemplate}, the root URL will only apply when {@code String} variants of
+	 * the {@link RestTemplate} methods are used for specifying the request URL. See
+	 * {@link RootUriTemplateHandler} for details.
 	 * @param rootUri the root URI or {@code null}
 	 * @return a new builder instance
 	 */