SAK-23504 merge trunk r122955

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