Allow Body content to be captured when both query-string & form params are provided

According to the javadocs for ClientDriverRequest.withParams() it should expect query-string params only, but the previous code catches form content as well.

Another effect of using HttpServletRequest.getParameterMap() is that it consumes the request's inputStream, so request.getInputStream() always returns null afterwards.