Merge branch 'trunk' into pinned-browser-updates

Author: diemol

java/spotbugs-excludes.xml

@@ -63,16 +63,6 @@
     <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
   </Match>
 
-  <Match>
-    <Class name="org.openqa.selenium.firefox.Executable"/>
-    <Bug pattern="NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
-  </Match>
-
-  <Match>
-    <Class name="org.openqa.selenium.firefox.FirefoxBinary"/>
-    <Bug pattern="DMI_HARDCODED_ABSOLUTE_FILENAME,NP_NULL_ON_SOME_PATH_FROM_RETURN_VALUE"/>
-  </Match>
-
   <Match>
     <Class name="org.openqa.selenium.firefox.FirefoxDriver"/>
     <Bug pattern="NP_BOOLEAN_RETURN_NULL,UUF_UNUSED_PUBLIC_OR_PROTECTED_FIELD"/>