Merge Glossary generation updates and some terminology updates

Merged Rieks Joosten requested to merge terminology-rieks into master

Merge request reports