SAK-20768 Fix missing keys and addition of comment to avoid removal



git-svn-id: https://source.sakaiproject.org/svn/mailarchive/trunk@123195 66ffb92e-73f9-0310-93c1-f5514f145a0a