SAK-23464 merge r124980 from trunk

git-svn-id: https://source.sakaiproject.org/svn/content/branches/sakai-2.9.x@127202 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23599 merge r124979 from trunk

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