Merge branch '5.3.x'

# Conflicts:
#	spring-context/src/main/java/org/springframework/context/annotation/CommonAnnotationBeanPostProcessor.java

spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java

@@ -47,6 +47,7 @@ import org.springframework.util.StringUtils;
  *
  * @author Chris Beams
  * @author Juergen Hoeller
+ * @author Phillip Webb
  * @since 3.1
  * @see ConfigurableEnvironment
  * @see StandardEnvironment
@@ -127,6 +128,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 	 * {@link #customizePropertySources(MutablePropertySources)} during
 	 * construction to allow subclasses to contribute or manipulate
 	 * {@link PropertySource} instances as appropriate.
+	 * @param propertySources property sources to use
 	 * @since 5.3.4
 	 * @see #customizePropertySources(MutablePropertySources)
 	 */
@@ -136,6 +138,7 @@ public abstract class AbstractEnvironment implements ConfigurableEnvironment {
 		customizePropertySources(propertySources);
 	}
 
+
 	/**
 	 * Factory method used to create the {@link ConfigurablePropertyResolver}
 	 * instance used by the Environment.

spring-core/src/main/java/org/springframework/core/env/StandardEnvironment.java

@@ -46,6 +46,7 @@ package org.springframework.core.env;
  * variable names.
  *
  * @author Chris Beams
+ * @author Phillip Webb
  * @since 3.1
  * @see ConfigurableEnvironment
  * @see SystemEnvironmentPropertySource
@@ -61,13 +62,15 @@ public class StandardEnvironment extends AbstractEnvironment {
 
 
 	/**
-	 * Create a new {@code StandardEnvironment} instance.
+	 * Create a new {@code StandardEnvironment} instance with a default
+	 * {@link MutablePropertySources} instance.
 	 */
 	public StandardEnvironment() {
 	}
 
 	/**
-	 * Create a new {@code StandardEnvironment} instance with a specific {@link MutablePropertySources} instance.
+	 * Create a new {@code StandardEnvironment} instance with a specific
+	 * {@link MutablePropertySources} instance.
 	 * @param propertySources property sources to use
 	 * @since 5.3.4
 	 */