Bug 916758 - Give better message on config failure
Merge pull request #4957 from danmcp/master

Merged by openshift-bot