Auto merge of #6398 - jgraham:wptrunner_upgrade_servodriver, r=Ms2ger

Fixes issue with servodriver

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6398)
<!-- Reviewable:end -->

tests/wpt/harness/test/test.cfg.example

@@ -8,7 +8,7 @@ ssl-type=none
 # prefs-root=/path/to/gecko-src/testing/profiles/
 
 # [servo]
-# binary=/path/to/servo-src/target/release/servo
+# binary=/path/to/servo-src/components/servo/target/servo
 # exclude=testharness # Because it needs a special testharness.js
 
 # [chrome]

tests/wpt/harness/wptrunner/browsers/servodriver.py

@@ -42,7 +42,7 @@ def browser_kwargs(**kwargs):
             "debug_info": kwargs["debug_info"]}
 
 
-def executor_kwargs(test_type, server_config, cache_manager, **kwargs):
+def executor_kwargs(test_type, server_config, cache_manager, run_info_data, **kwargs):
     rv = base_executor_kwargs(test_type, server_config,
                               cache_manager, **kwargs)
     return rv