Fix activation error reporting in update_cluster
Merge pull request #4032 from ncdc/update-cluster-fix-error-reporting

Merged by openshift-bot