Merge pull request #5299 from Wikia/UC-71-2

UC-71 Fix redirect issue with encoded querystring
(cherry picked from commit 4638ee267ea8b42738ae6683084b8a905a60b976)