Fix migration given how rate limits moved around in the model.

I think..
Fix other migration for rate limit move.
Ensure the apis get sorted consistently, even when missing sort_order.
Merge branch 'master' into gsa