Merge branch '2.1.x'

Closes gh-16960

spring-boot-project/spring-boot-tools/spring-boot-maven-plugin/src/main/java/org/springframework/boot/maven/AbstractRunMojo.java

@@ -287,7 +287,10 @@ public abstract class AbstractRunMojo extends AbstractDependencyFilterMojo {
 		addClasspath(args);
 		args.add(startClassName);
 		addArgs(args);
-		runWithForkedJvm(this.workingDirectory, args, determineEnvironmentVariables());
+		runWithForkedJvm(
+				(this.workingDirectory != null) ? this.workingDirectory
+						: this.project.getBasedir(),
+				args, determineEnvironmentVariables());
 	}
 
 	/**