SAK-23820 merge r127918,r127965 from trunk


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