Fixing request_uri reference
Merge branch 'master' into openshift