SAK-22703 merge r117370,117750 from trunk


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