SAK-22915 merge r117647 from trunk

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

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