attempt to fix encoding problems of request params

(cherry picked from commit 514513c)
don't reqire master branch for release

(cherry picked from commit 668a27a)