SAK-25862 merge 307330 307331 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@307514 66ffb92e-73f9-0310-93c1-f5514f145a0a
CLE-25826 merge 307292 to 10.x

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