Merge oauth querystring into endpoint querystring if present

Previously, an endpoint with a querystring would result in an invalid
URL because of how oauth parameters were appended.