Merge "Docs: add a glossary" into feature/zuulv3