Merge branch '2.4.x' into 2.5.x

Closes gh-27010

Author: snicoll

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/env/RandomValuePropertySource.java

@@ -44,6 +44,7 @@
  * specified range.</li>
  * <li>When {@literal "long"}, a random {@link Long} value, restricted by an optionally
  * specified range.</li>
+ * <li>When {@literal "uuid"}, a random {@link UUID} value.</li>
  * <li>Otherwise, a {@code byte[]}.</li>
  * </ul>
  * The {@literal "random.int"} and {@literal "random.long"} properties supports a range