SAK-11653 merge trunk r118556

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