Don't lose body content when getting query-string params.
Make ClientDriverRequest.withParams() work as expected (expect query-string
params only, not form params)
Make waitFor test less flaky - seems to fail about 1/2 the time I run it.