Change uber-JAR classifier; fix slot matcher

Author: sbabcoc

src/assembly/assembly.xml

@@ -1,7 +1,7 @@
 <assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0"
           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
           xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 http://maven.apache.org/xsd/assembly-2.2.0.xsd">
-  <id>jar-with-deps</id>
+  <id>grid-extension</id>
   <formats>
     <format>jar</format>
   </formats>

src/main/java/org/openqa/selenium/htmlunit/remote/HtmlUnitSlotMatcher.java

@@ -1,11 +1,10 @@
 package org.openqa.selenium.htmlunit.remote;
 
-import java.io.Serializable;
 import org.openqa.selenium.Capabilities;
-import org.openqa.selenium.grid.data.SlotMatcher;
+import org.openqa.selenium.grid.data.DefaultSlotMatcher;
 import org.openqa.selenium.remote.Browser;
 
-public class HtmlUnitSlotMatcher implements SlotMatcher, Serializable {
+public class HtmlUnitSlotMatcher extends DefaultSlotMatcher {
 
     private static final long serialVersionUID = 1L;
 
@@ -20,7 +19,11 @@ public boolean matches(Capabilities stereotype, Capabilities capabilities) {
             return false;
         }
 
-        return Browser.HTMLUNIT.is(capabilities);
+        if (Browser.HTMLUNIT.is(stereotype) && Browser.HTMLUNIT.is(capabilities)) {
+            return true;
+        }
+        
+        return super.matches(stereotype, capabilities);
     }
 
     private Boolean managedDownloadsEnabled(Capabilities stereotype, Capabilities capabilities) {