Fix region endpoint for cn-north-1

The endpoint heuristic rule is wrong.
Also looks like the local region changes
weren't scripts/buildall'd, so that shows
up in the diff
Merge branch 'fix-endpoints' into develop

* fix-endpoints:
  Fix region endpoint for cn-north-1