SAK-22455 merge r310260,310263 from trunk


git-svn-id: https://source.sakaiproject.org/svn/portal/branches/sakai-10.x@311247 66ffb92e-73f9-0310-93c1-f5514f145a0a