Bug 1078684 - fixes rhc help options
Fixes failing test (was reaching the 3 gears limit)
Merge pull request #570 from fabianofranz/bugs/1078684

Merged by openshift-bot
Merge pull request #571 from fabianofranz/master

Merged by openshift-bot