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

Changes to fix short option -G --ec2-groups
For knife-cloud changes: https://github.com/opscode/knife-cloud/pull/54

^@adamedx