Move paginator config to top level key
Bug fix for proper processing of enhancements files

There were some bugs when switching from the .py files
to the .extra.json files.
Regen ec2 config model for new pagination