X-Remote-User must be blocked at the toplevel apache
Merge pull request #5330 from brenton/master

Merged by openshift-bot
Merge pull request #5331 from danmcp/master

Merged by openshift-bot