Glossary Bugfixes for ATLAS-2612, ATLAS-2613, ATLAS-2614, ATLAS-2616, ATLAS-2625, ATLAS-2626, ATLAS-2627, ATLAS-2628, ATLAS-2629

Change-Id: I5452ee90584b077d58b9fc24392b02f54d8c5ce1