Merge branch '3.4.x' into 3.5.x

Closes gh-47905

Author: snicoll

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/BootstrapContext.java

@@ -76,7 +76,6 @@ public interface BootstrapContext {
 	 * @param exceptionSupplier the supplier which will return the exception to be thrown
 	 * @return the instance managed by the context, which may be {@code null}
 	 * @throws X if the type has not been registered
-	 * @throws IllegalStateException if the type has not been registered
 	 */
 	<T, X extends Throwable> T getOrElseThrow(Class<T> type, Supplier<? extends X> exceptionSupplier) throws X;