Merge branch '5.8.x'

Closes gh-11981

build.gradle

@@ -179,12 +179,9 @@ nohttp {
 }
 
 tasks.register('cloneSamples', IncludeRepoTask) {
-	if (!project.hasProperty("cloneOutputDirectory")) {
-		throw new GradleException("Required parameter 'cloneOutputDirectory' not found")
-	}
 	repository = 'spring-projects/spring-security-samples'
 	ref = samplesBranch
-	outputDirectory = project.file("$cloneOutputDirectory")
+	outputDirectory = project.hasProperty("cloneOutputDirectory") ? project.file("$cloneOutputDirectory") : project.file("build/samples")
 }
 
 s101 {