Better message for bug 1028633
Merge pull request #4524 from danmcp/master

Merged by openshift-bot