Merge branch '0.4.x' into 1.0.x

Closes gh-1193

settings.gradle

@@ -8,7 +8,7 @@ pluginManagement {
 
 plugins {
 	id "com.gradle.enterprise" version "3.11.1"
-	id "io.spring.ge.conventions" version "0.0.11"
+	id "io.spring.ge.conventions" version "0.0.13"
 }
 
 dependencyResolutionManagement {