Apply url.withQueryParams fix from #1861
Merge pull request #2745 from wsargent/fix-oauth-queryparams

Apply url.withQueryParams fix from #1861