Sync glossary updates for brass to glass rename
Sync relevant changes from xapian-core