Bug 1079584: Fix scp option conflict with global option