Merge remote-tracking branch 'origin/jetty-9.3.x' into jetty-9.4.x

jetty-monitor/src/test/java/org/eclipse/jetty/monitor/ThreadMonitorTest.java

@@ -26,6 +26,7 @@ import java.util.concurrent.atomic.AtomicInteger;
 
 import org.eclipse.jetty.util.component.Dumpable;
 import org.eclipse.jetty.util.log.StacklessLogging;
+import org.junit.Ignore;
 import org.junit.Test;
 
 
@@ -36,6 +37,7 @@ public class ThreadMonitorTest
 {
     public final static int DURATION=4000;
     
+    @Ignore
     @Test
     public void monitorTest() throws Exception
     {

jetty-server/src/main/java/org/eclipse/jetty/server/HttpChannelState.java

@@ -209,8 +209,6 @@ public class HttpChannelState
                     return Action.DISPATCH;
 
                 case COMPLETING:
-                    return Action.COMPLETE;
-
                 case COMPLETED:
                     return Action.TERMINATED;