Merge branch '2.4.x' into 2.5.x

See gh-28484

Author: wilkinsona

buildSrc/src/main/java/org/springframework/boot/build/JavaConventions.java

@@ -156,7 +156,6 @@ private void configureTestConventions(Project project) {
 		project.getTasks().withType(Test.class, (test) -> {
 			test.useJUnitPlatform();
 			test.setMaxHeapSize("1024M");
-			test.setMaxParallelForks(project.getGradle().getStartParameter().getMaxWorkerCount());
 			project.getTasks().withType(Checkstyle.class, (checkstyle) -> test.mustRunAfter(checkstyle));
 			project.getTasks().withType(CheckFormat.class, (checkFormat) -> test.mustRunAfter(checkFormat));
 		});