Merge branch '6.1.x'

# Conflicts:
#	buildSrc/src/main/java/org/springframework/build/TestConventions.java

spring-web/src/test/java/org/springframework/http/converter/json/GsonFactoryBeanTests.java

@@ -128,9 +128,10 @@ class GsonFactoryBeanTests {
 		cal.set(Calendar.DATE, 1);
 		Date date = cal.getTime();
 		bean.setDate(date);
+		// \p{Zs} matches any Unicode space character
 		assertThat(gson.toJson(bean))
 				.startsWith("{\"date\":\"Jan 1, 2014")
-				.endsWith("12:00:00 AM\"}");
+				.matches(".+?12:00:00\\p{Zs}AM\"}");
 	}
 
 	@Test