SAK-23157 merge r122313,122314 from trunk


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


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