Merge remote-tracking branch 'origin/master' into servlet-3.1-api

jetty-servlet/src/main/java/org/eclipse/jetty/servlet/ServletContextHandler.java

@@ -509,7 +509,7 @@ public class ServletContextHandler extends ContextHandler
             setSessionHandler((SessionHandler) handler);
         else if (handler instanceof SecurityHandler)
             setSecurityHandler((SecurityHandler)handler);
-        else if (handler instanceof HandlerWrapper)
+        else if (handler == null || handler instanceof HandlerWrapper)
         {
             super.setHandler(handler);
             relinkHandlers();

pom.xml

@@ -775,3 +775,4 @@
     </profile>
   </profiles>
 </project>
+