SAK-23727 merge r125944,r125946 from trunk


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