Added changes to resolved short option ambiguity
Merge pull request #193 from ClogenyTechnologies/sid-oc-11210-short-opt-ambiguity

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