SAK-22996 merge r117235 from trunk

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@118843 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23001 merge r117386 from trunk

git-svn-id: https://source.sakaiproject.org/svn/site-manage/branches/sakai-2.9.x@118849 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22910 merge r116533 from trunk

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