Consolidated wikibase.Site

Change-Id: Ife7f678086b15696280fe693bbc6acdb9c86f6b1
Merge "Consolidated wikibase.Site"