Merge branch '2.4.x' into 2.5.x

Closes gh-28382

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

@@ -1,5 +1,5 @@
 /*
- * Copyright 2012-2020 the original author or authors.
+ * Copyright 2012-2021 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,9 +40,9 @@
  * take the following constructor parameters:
  * <ul>
  * <li>{@link DeferredLogFactory} - A factory that can be used to create loggers with
- * output deferred until the application has been full prepared (allowing the environment
+ * output deferred until the application has been fully prepared (allowing the environment
  * itself to configure logging levels).</li>
- * <li>{@link Log} - A log with output deferred until the application has been full
+ * <li>{@link Log} - A log with output deferred until the application has been fully
  * prepared (allowing the environment itself to configure logging levels).</li>
  * <li>{@link ConfigurableBootstrapContext} - A bootstrap context that can be used to
  * store objects that may be expensive to create, or need to be shared