Merge branch '2.1.x'

Closes gh-17212

Author: wilkinsona

spring-boot-project/spring-boot/src/main/java/org/springframework/boot/web/reactive/error/DefaultErrorAttributes.java

@@ -88,8 +88,7 @@ public Map<String, Object> getErrorAttributes(ServerRequest request, boolean inc
 		HttpStatus errorStatus = determineHttpStatus(error, responseStatusAnnotation);
 		errorAttributes.put("status", errorStatus.value());
 		errorAttributes.put("error", errorStatus.getReasonPhrase());
-		String message = determineMessage(error, responseStatusAnnotation);
-		errorAttributes.put("message", (message != null) ? message : "");
+		errorAttributes.put("message", determineMessage(error, responseStatusAnnotation));
 		errorAttributes.put("requestId", request.exchange().getRequest().getId());
 		handleException(errorAttributes, determineException(error), includeStackTrace);
 		return errorAttributes;