SAK-23164 merge r118781 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@118850 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22905 merge r116482 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@118853 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23053 merge r117794 from trunk

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