Bug 956366 - v1 status cleanup and fix v2 status exceptions.
Merge pull request #2302 from rmillner/ctl_gears

Merged by openshift-bot