Bug 1070317: Pass original request uri to the backend.
Fixing tests
Merge pull request #4836 from danmcp/master

Merged by openshift-bot
Revert "Multiple fixes for stability"

This reverts commit ad56a8f7d106792b6e934828a4ae8bb9c3d51753.
Merge pull request #4834 from mrunalp/bugs/1070317

Merged by openshift-bot