SAK-23089 merge r124055,r126615 from trunk


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