Bug 1079584: Fix scp option conflict with global option
Merge pull request #569 from liggitt/bug_1079584_scp_conflict

Merged by openshift-bot
Automatic commit of package [rhc] release [1.22.4-1].
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
[origin-ui-162] surface more information in the UI for external cartridges
Merge pull request #565 from fabianofranz/dev/162

Merged by openshift-bot