SAK-26589 merge r310468,310471 from trunk


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