SAK-23454 merge r122271 from trunk

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

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