Set 'Aborted' result before invoking BuildWrapper's tearDown. Fixes JENKINS-7864 and JENKINS-8054.

core/src/main/java/hudson/model/Build.java

@@ -37,6 +37,7 @@ import java.util.Collection;
 import java.util.List;
 import java.util.logging.Logger;
 
+import static hudson.model.Result.ABORTED;
 import static hudson.model.Result.FAILURE;
 
 /**
@@ -136,6 +137,9 @@ public abstract class Build <P extends Project<P,B>,B extends Build<P,B>>
 
                 if(!build(listener,project.getBuilders()))
                     r = FAILURE;
+            } catch (InterruptedException e) {
+                r = ABORTED;
+                throw e;
             } finally {
                 if (r != null) setResult(r);
                 // tear down in reverse order

maven-plugin/src/main/java/hudson/maven/MavenModuleSetBuild.java

@@ -24,6 +24,7 @@
  */
 package hudson.maven;
 
+import static hudson.model.Result.ABORTED;
 import static hudson.model.Result.FAILURE;
 import hudson.AbortException;
 import hudson.EnvVars;
@@ -651,6 +652,9 @@ public class MavenModuleSetBuild extends AbstractMavenBuild<MavenModuleSet,Maven
                                 process.discard();
                             }
                         }
+                    } catch (InterruptedException e) {
+                        r = ABORTED;
+                        throw e;
                     } finally {
                         if (r != null) {
                             setResult(r);