X-Remote-User must be blocked at the toplevel apache
Merge pull request #5332 from brenton/openshift-origin-release-3

X-Remote-User must be blocked at the toplevel apache
Merge remote branch 'openshift/openshift-origin-release-3' into worldline-openshift-origin-release-3