SAK-23109 merge r118188 from trunk

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@118576 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23139 merge r118379 from trunk

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@118577 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23078 merge r118334 from trunk

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