SAK-26168 merge 309008 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/help/branches/sakai-10.x@309235 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26178 merge 309009 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/help/branches/sakai-10.x@309237 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22815 merge 307873 to 10.x

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