SAK-26246 merge 309658 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/portal/branches/sakai-10.x@309811 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25477 merge 308980 to 10.x

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