Encode timeouts the w3c way too

This allows us to get the latest geckodriver using
timeouts properly.

Author: shs96c

java/client/src/org/openqa/selenium/remote/RemoteWebDriver.java

@@ -833,20 +833,23 @@ protected class RemoteTimeouts implements Timeouts {
 
       public Timeouts implicitlyWait(long time, TimeUnit unit) {
         execute(DriverCommand.SET_TIMEOUT, ImmutableMap.of(
+            "implicit", TimeUnit.MILLISECONDS.convert(time, unit),
             "type", "implicit",
             "ms", TimeUnit.MILLISECONDS.convert(time, unit)));
         return this;
       }
 
       public Timeouts setScriptTimeout(long time, TimeUnit unit) {
         execute(DriverCommand.SET_TIMEOUT, ImmutableMap.of(
+            "script", TimeUnit.MILLISECONDS.convert(time, unit),
             "type", "script",
             "ms", TimeUnit.MILLISECONDS.convert(time, unit)));
         return this;
       }
 
       public Timeouts pageLoadTimeout(long time, TimeUnit unit) {
         execute(DriverCommand.SET_TIMEOUT, ImmutableMap.of(
+            "pageLoad", TimeUnit.MILLISECONDS.convert(time, unit),
             "type", "page load",
             "ms", TimeUnit.MILLISECONDS.convert(time, unit)));
         return this;