OC-11210 EC2 refactored code has ambiguity in the name of short-option for Gateway & Groups

Fixed - short options -G --ssh-gateway and -A --forward-agent

^@adamedx.