Merge "(bug 43595) Add a cache version variable to SiteArray"