SAK-25746 merge 307387 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/content/branches/sakai-10.x@307945 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25868 merge 307388 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/content/branches/sakai-10.x@307946 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25887 merge 307542 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/content/branches/sakai-10.x@307947 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25969 merge 307595 307600 307626 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/content/branches/sakai-10.x@307948 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25938 merge 307631 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/content/branches/sakai-10.x@307949 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25747 merge 307697 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/content/branches/sakai-10.x@307950 66ffb92e-73f9-0310-93c1-f5514f145a0a