SAK-23131 merge r118351,118355 from trunk

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