Merge pull request #568 from danmcp/master

Merged by openshift-bot
Bug 1079584: Fix scp option conflict with global option
Merge pull request #569 from liggitt/bug_1079584_scp_conflict

Merged by openshift-bot