Fixing timeout issue in the Grid.

Author: barancev

java/server/src/org/openqa/grid/internal/BaseRemoteProxy.java

@@ -144,7 +144,7 @@ public BaseRemoteProxy(RegistrationRequest request, Registry registry) {
 
     maxConcurrentSession = getConfigInteger(RegistrationRequest.MAX_SESSION);
     cleanUpCycle = getConfigInteger(RegistrationRequest.CLEAN_UP_CYCLE);
-    timeOutMs = getConfigInteger(RegistrationRequest.TIME_OUT);
+    timeOutMs = getConfigInteger(RegistrationRequest.TIME_OUT) * 1000;
     statusCheckTimeout = getConfigInteger(RegistrationRequest.STATUS_CHECK_TIMEOUT);
 
     List<DesiredCapabilities> capabilities = request.getCapabilities();

java/server/src/org/openqa/selenium/server/SeleniumServer.java

@@ -1022,6 +1022,8 @@ public static RemoteControlConfiguration parseLauncherOptions(String[] args) {
         configuration.setDebugURL(getArg(args, ++i));
       } else if ("-timeout".equalsIgnoreCase(arg)) {
         configuration.setTimeoutInSeconds(Integer.parseInt(getArg(args, ++i)));
+      } else if ("-browserTimeout".equalsIgnoreCase(arg)) {
+        configuration.setBrowserTimeoutInMs(Integer.parseInt(getArg(args, ++i)));
       } else if ("-jettyThreads".equalsIgnoreCase(arg)) {
         int jettyThreadsCount = Integer.parseInt(getArg(args, ++i));