SAK-25977 merge 307741 307806 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@307876 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25976 merge 307549 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@307881 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23845 merge 306993 307826 to 10.x

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