SAK-22878 merge trunk r115753

git-svn-id: https://source.sakaiproject.org/svn/config/branches/sakai-2.8.x@118526 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22430 merge trunk r110978

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