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].
Merge remote-tracking branch 'upstream/master'