Bug 1032906: Fix generic error handling in Openshift agent
Merge pull request #4220 from ironcladlou/bz/1032906

Merged by openshift-bot