Merge branch '6.2.x'

# Conflicts:
#	framework-platform/framework-platform.gradle

Author: jhoeller

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/ResponseBodyEmitter.java

@@ -92,6 +92,7 @@ public class ResponseBodyEmitter {
 	/** Guards access to write operations on the response. */
 	protected final Lock writeLock = new ReentrantLock();
 
+
 	/**
 	 * Create a new ResponseBodyEmitter instance.
 	 */

spring-webmvc/src/main/java/org/springframework/web/servlet/mvc/method/annotation/SseEmitter.java

@@ -45,6 +45,7 @@ public class SseEmitter extends ResponseBodyEmitter {
 
 	private static final MediaType TEXT_PLAIN = new MediaType("text", "plain", StandardCharsets.UTF_8);
 
+
 	/**
 	 * Create a new SseEmitter instance.
 	 */