Merge pull request #3877 from rhamilto/master

Merged by openshift-bot
Merge branch 'master' of github.com:openshift/origin-server