fixed merge syntax errors

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

@@ -350,7 +350,7 @@ class HttpChannelOverHttp extends HttpChannel implements HttpParser.RequestHandl
     public void abort()
     {
         super.abort();
-        _generator.setPersistent(false);
+        _httpConnection._generator.setPersistent(false);
     }
 
     @Override

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

@@ -450,7 +450,6 @@ public class HttpConnection extends AbstractConnection implements Runnable, Http
         _sendCallback.iterate();
     }
 
-            super.abort();
     private class SendCallback extends IteratingCallback
     {
         private ResponseInfo _info;

jetty-websocket/javax-websocket-client-impl/src/test/java/org/eclipse/jetty/websocket/jsr356/DecoderReaderTest.java

@@ -272,7 +272,6 @@ public class DecoderReaderTest
     }
 
     // TODO analyse and fix 
-    @Ignore
     @Test
     @Ignore ("Quotes appear to be able to arrive in any order?")
     public void testTwoQuotes() throws Exception