SAK-21374 merge trunk r103413

git-svn-id: https://source.sakaiproject.org/svn/reference/branches/sakai-2.8.x@118606 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-21610 merge trunk r108262

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