Merge "Output wikiid/api in meta=siteinfo only when non-empty"