corrected name of edgegateway generator
Merge pull request #2286 from alphagov/fixing_generator_name

corrected name of edgegateway generator
[rackspace|block_storage] fixing merge issue
Merge pull request #2290 from rackspace/merge_fix

[rackspace|block_storage] fixing merge issue
Auto-merge remote-tracking branch 'upstream/master'