Improve upgrade MCollective response handling
Merge pull request #3617 from ironcladlou/dev/upgrade-stability

Merged by openshift-bot