SAK-22497 merge trunk r111672

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.8.x@118622 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23109 merge trunk r118188

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.8.x@118623 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22996 merge trunk r117235

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