Merge branch '5.7.x' into 5.8.x

settings.gradle

@@ -6,7 +6,7 @@ pluginManagement {
 }
 
 plugins {
-	id "com.gradle.enterprise" version "3.8.1"
+	id "com.gradle.enterprise" version "3.11.1"
 	id "io.spring.ge.conventions" version "0.0.7"
 }