SAK-23169 merge r119360 from trunk


git-svn-id: https://source.sakaiproject.org/svn/web/branches/sakai-2.9.x@121335 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23170 merge r119398 from trunk


git-svn-id: https://source.sakaiproject.org/svn/web/branches/sakai-2.9.x@121336 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-12563 SAK-21624 SAK-21623 mega merge r120008,120164,120166,120167,120168,120169,120258


git-svn-id: https://source.sakaiproject.org/svn/web/branches/sakai-2.9.x@121337 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23297 merge r120594 from trunk


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