SAK-26207 merge 309438 309440 to 10.x

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

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