SAK-21677 merge trunk r108820, 113145

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