SAK-23222 merge r119950,r119951 from trunk

git-svn-id: https://source.sakaiproject.org/svn/mailarchive/branches/mailarchive-2.9.x@127752 66ffb92e-73f9-0310-93c1-f5514f145a0a