Update pagination/waiter configs for JSON models

This also runs the .extra.json files through a json formatter so that we have consistent diffs going forward as we pull in new changes.