openshift-merge-robot Merge pull request #3173 from rhamilto/error-messages