Confusion reduction: rename catalogId to siteId.  It's always been siteIds.
CatalogId made more sense when that was the type of the value that
came out of the catalog (when we got the siteId out of the catalog),
but now it just misleads the reader into thinking it actually has
something to do with the catalog.