Fix `rewrite_base_url`: don't discard query params (#2599)

## Description
The previous version of this function discarded query params, which
meant that if our model had a `@httpQuery` bound input, those would not
be sent to the server and the requests would fail.

## Testing
Ran existing tests

----

_By submitting this pull request, I confirm that you can use, modify,
copy, and redistribute this contribution, under the terms of your
choice._