diff --git a/jetty-http/pom.xml b/jetty-http/pom.xml
index 2439c0b09d1..aa5a9229fb9 100644
--- a/jetty-http/pom.xml
+++ b/jetty-http/pom.xml
@@ -17,11 +17,6 @@
       <artifactId>jetty-io</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>org.eclipse.jetty.orbit</groupId>
-      <artifactId>javax.servlet</artifactId>
-      <scope>provided</scope>
-    </dependency>
     <dependency>
       <groupId>org.eclipse.jetty.toolchain</groupId>
       <artifactId>jetty-test-helper</artifactId>
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/gzip/AbstractCompressedStream.java b/jetty-server/src/main/java/org/eclipse/jetty/server/gzip/AbstractCompressedStream.java
index 2d4831f2ad3..5045415e144 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/gzip/AbstractCompressedStream.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/gzip/AbstractCompressedStream.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.http.gzip;
+package org.eclipse.jetty.server.gzip;
 
 import java.io.IOException;
 import java.io.OutputStream;
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/gzip/CompressedResponseWrapper.java b/jetty-server/src/main/java/org/eclipse/jetty/server/gzip/CompressedResponseWrapper.java
index 6557f78a519..22bd1007612 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/gzip/CompressedResponseWrapper.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/gzip/CompressedResponseWrapper.java
@@ -16,7 +16,7 @@
 //  ========================================================================
 //
 
-package org.eclipse.jetty.http.gzip;
+package org.eclipse.jetty.server.gzip;
 
 import java.io.IOException;
 import java.io.OutputStream;
@@ -58,7 +58,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#setMimeTypes(java.util.Set)
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#setMimeTypes(java.util.Set)
      */
     public void setMimeTypes(Set<String> mimeTypes)
     {
@@ -67,7 +67,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#setBufferSize(int)
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#setBufferSize(int)
      */
     @Override
     public void setBufferSize(int bufferSize)
@@ -77,7 +77,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#setMinCompressSize(int)
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#setMinCompressSize(int)
      */
     public void setMinCompressSize(int minCompressSize)
     {
@@ -86,7 +86,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#setContentType(java.lang.String)
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#setContentType(java.lang.String)
      */
     @Override
     public void setContentType(String ct)
@@ -110,7 +110,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#setStatus(int, java.lang.String)
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#setStatus(int, java.lang.String)
      */
     @Override
     public void setStatus(int sc, String sm)
@@ -122,7 +122,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#setStatus(int)
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#setStatus(int)
      */
     @Override
     public void setStatus(int sc)
@@ -134,7 +134,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#setContentLength(int)
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#setContentLength(int)
      */
     @Override
     public void setContentLength(int length)
@@ -164,7 +164,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#addHeader(java.lang.String, java.lang.String)
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#addHeader(java.lang.String, java.lang.String)
      */
     @Override
     public void addHeader(String name, String value)
@@ -193,7 +193,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#flushBuffer()
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#flushBuffer()
      */
     @Override
     public void flushBuffer() throws IOException
@@ -208,7 +208,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#reset()
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#reset()
      */
     @Override
     public void reset()
@@ -224,7 +224,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#resetBuffer()
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#resetBuffer()
      */
     @Override
     public void resetBuffer()
@@ -238,7 +238,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#sendError(int, java.lang.String)
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#sendError(int, java.lang.String)
      */
     @Override
     public void sendError(int sc, String msg) throws IOException
@@ -249,7 +249,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#sendError(int)
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#sendError(int)
      */
     @Override
     public void sendError(int sc) throws IOException
@@ -260,7 +260,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#sendRedirect(java.lang.String)
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#sendRedirect(java.lang.String)
      */
     @Override
     public void sendRedirect(String location) throws IOException
@@ -271,7 +271,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#noCompression()
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#noCompression()
      */
     public void noCompression()
     {
@@ -291,7 +291,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#finish()
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#finish()
      */
     public void finish() throws IOException
     {
@@ -303,7 +303,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#setHeader(java.lang.String, java.lang.String)
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#setHeader(java.lang.String, java.lang.String)
      */
     @Override
     public void setHeader(String name, String value)
@@ -330,7 +330,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#getOutputStream()
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#getOutputStream()
      */
     @Override
     public ServletOutputStream getOutputStream() throws IOException
@@ -353,7 +353,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#getWriter()
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#getWriter()
      */
     @Override
     public PrintWriter getWriter() throws IOException
@@ -377,7 +377,7 @@ public abstract class CompressedResponseWrapper extends HttpServletResponseWrapp
 
     /* ------------------------------------------------------------ */
     /**
-     * @see org.eclipse.jetty.http.gzip.CompressedResponseWrapper#setIntHeader(java.lang.String, int)
+     * @see org.eclipse.jetty.server.gzip.CompressedResponseWrapper#setIntHeader(java.lang.String, int)
      */
     @Override
     public void setIntHeader(String name, int value)
diff --git a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/GzipHandler.java b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/GzipHandler.java
index 9768d1fa092..77b63474ee0 100644
--- a/jetty-server/src/main/java/org/eclipse/jetty/server/handler/GzipHandler.java
+++ b/jetty-server/src/main/java/org/eclipse/jetty/server/handler/GzipHandler.java
@@ -37,9 +37,9 @@ import org.eclipse.jetty.continuation.Continuation;
 import org.eclipse.jetty.continuation.ContinuationListener;
 import org.eclipse.jetty.continuation.ContinuationSupport;
 import org.eclipse.jetty.http.HttpMethod;
-import org.eclipse.jetty.http.gzip.AbstractCompressedStream;
-import org.eclipse.jetty.http.gzip.CompressedResponseWrapper;
 import org.eclipse.jetty.server.Request;
+import org.eclipse.jetty.server.gzip.AbstractCompressedStream;
+import org.eclipse.jetty.server.gzip.CompressedResponseWrapper;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
index 99ef4dc9e02..d0978692cff 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/GzipFilter.java
@@ -38,8 +38,8 @@ import org.eclipse.jetty.continuation.Continuation;
 import org.eclipse.jetty.continuation.ContinuationListener;
 import org.eclipse.jetty.continuation.ContinuationSupport;
 import org.eclipse.jetty.http.HttpMethod;
-import org.eclipse.jetty.http.gzip.AbstractCompressedStream;
-import org.eclipse.jetty.http.gzip.CompressedResponseWrapper;
+import org.eclipse.jetty.server.gzip.AbstractCompressedStream;
+import org.eclipse.jetty.server.gzip.CompressedResponseWrapper;
 import org.eclipse.jetty.util.log.Log;
 import org.eclipse.jetty.util.log.Logger;
 
diff --git a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludableGzipFilter.java b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludableGzipFilter.java
index 14f89bc6e33..2ff4d363e57 100644
--- a/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludableGzipFilter.java
+++ b/jetty-servlets/src/main/java/org/eclipse/jetty/servlets/IncludableGzipFilter.java
@@ -31,9 +31,9 @@ import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import org.eclipse.jetty.http.gzip.AbstractCompressedStream;
-import org.eclipse.jetty.http.gzip.CompressedResponseWrapper;
 import org.eclipse.jetty.io.UncheckedPrintWriter;
+import org.eclipse.jetty.server.gzip.AbstractCompressedStream;
+import org.eclipse.jetty.server.gzip.CompressedResponseWrapper;
 
 /* ------------------------------------------------------------ */
 /** Includable GZip Filter.
diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterContentLengthTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterContentLengthTest.java
index 2e06a2db194..e8c7ecb45b2 100644
--- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterContentLengthTest.java
+++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterContentLengthTest.java
@@ -24,7 +24,7 @@ import java.util.List;
 import javax.servlet.Servlet;
 
 import org.eclipse.jetty.http.HttpStatus;
-import org.eclipse.jetty.http.gzip.CompressedResponseWrapper;
+import org.eclipse.jetty.server.gzip.CompressedResponseWrapper;
 import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlets.gzip.GzipTester;
 import org.eclipse.jetty.servlets.gzip.TestServletLengthStreamTypeWrite;
diff --git a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java
index c1584641058..d43887d385d 100644
--- a/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java
+++ b/jetty-servlets/src/test/java/org/eclipse/jetty/servlets/GzipFilterDefaultTest.java
@@ -27,7 +27,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.eclipse.jetty.http.HttpStatus;
-import org.eclipse.jetty.http.gzip.CompressedResponseWrapper;
+import org.eclipse.jetty.server.gzip.CompressedResponseWrapper;
 import org.eclipse.jetty.servlet.DefaultServlet;
 import org.eclipse.jetty.servlet.FilterHolder;
 import org.eclipse.jetty.servlets.gzip.GzipTester;
diff --git a/jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLEngineLeakTest.java b/jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLEngineLeakTest.java
index f563d482e05..2133e22599a 100644
--- a/jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLEngineLeakTest.java
+++ b/jetty-spdy/spdy-jetty/src/test/java/org/eclipse/jetty/spdy/SSLEngineLeakTest.java
@@ -30,6 +30,7 @@ import org.eclipse.jetty.spdy.api.server.ServerSessionFrameListener;
 import org.eclipse.jetty.util.ssl.SslContextFactory;
 import org.junit.Assert;
 import org.junit.Test;
+import org.junit.Ignore;
 
 public class SSLEngineLeakTest extends AbstractTest
 {
@@ -48,6 +49,7 @@ public class SSLEngineLeakTest extends AbstractTest
     }
 
     @Test
+    @Ignore
     public void testSSLEngineLeak() throws Exception
     {
         System.gc();