More merge fixes

Signed-off-by: Greg Wilkins <gregw@webtide.com>

jetty-http2/http2-server/src/main/java/org/eclipse/jetty/http2/server/HttpTransportOverHTTP2.java

@@ -332,7 +332,7 @@ public class HttpTransportOverHTTP2 implements HttpTransport
         stream.setAttachment(endPoint);
         if (request.getHttpInput().hasContent())
             return channel.sendErrorOrAbort("Unexpected content in CONNECT request");
-        return true;
+        return false;
     }
 
     @Override

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

@@ -736,7 +736,7 @@ public class HttpChannel implements Runnable, HttpOutput.Interceptor
      * <p>This avoids a race where the server is unprepared if the client sends
      * data immediately after having received the upgrade response.</p>
      * @return true if the channel is not complete and more processing is required,
-     * either because the upgrade has succeeded or sendError has been called.
+     * typically because sendError has been called.
      */
     protected boolean checkAndPrepareUpgrade()
     {