SAK-26286 merge 309840 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/mailarchive/branches/sakai-10.x@309911 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25595 merge 308328 to 10.x

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