Merge "Restore namespace-number keys in APIQuerySiteinfo siprop=namespaces"