Make Sites::singleton() actually return a singleton.

Sites::singleton() was returning a new instance for every call,
rendering in-process caching ineffective. This was causing extreme
slowness on some configurations (about factor 100).

Change-Id: I1e28afea8710b44542c55db150ad37518a5a5df1
Merge "Make Sites::singleton() actually return a singleton."