Merge pull request #1472 from jbaranov/JENKINS-25514

[JENKINS-25514] Fixed lock case in FutureImpl

core/src/main/java/hudson/model/queue/FutureImpl.java

@@ -84,6 +84,14 @@ public final class FutureImpl extends AsyncFutureImpl<Executable> implements Que
         }
     }
 
+    @Override
+    public synchronized void setAsCancelled() {
+        super.setAsCancelled();
+        if (!start.isDone()) {
+            start.setAsCancelled();
+        }
+    }
+
     synchronized void addExecutor(@Nonnull Executor executor) {
         this.executors.add(executor);
     }