SAK-27505 merge 310843 from trunk

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-10.x@315276 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-28011 merge 314814 from trunk

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