SAK-23113 merge r118239,r118240 from trunk


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


git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.9.x@121319 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23224 merge r119921,119922 from trunk


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