SAK-19286 merge trunk r103481,122154

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