SAK-27527 merge 310897 from trunk

git-svn-id: https://source.sakaiproject.org/svn/portal/branches/sakai-10.x@315275 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26603 merge 310588 from trunk

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