SAK-22751 merge r114104 from trunk


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


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


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


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


git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@121314 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22998 merge r117263,117357,117514 from trunk


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