SAK-23362 merge r121256 from trunk


git-svn-id: https://source.sakaiproject.org/svn/providers/branches/sakai-2.9.x@128950 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23689 merge r125712 from trunk


git-svn-id: https://source.sakaiproject.org/svn/providers/branches/sakai-2.9.x@128951 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23719 merge r125941 from trunk


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