Make Site ids be independent of instance ids.

Cleans up construction of sites by allowing sites to be constructed
before knowing of any instances that were allocated at the site.

Test: m ahat-test, with new SiteTest added.
Change-Id: I5429996a51aa3be3094989b3673d1b0a850cc3e8