SAK-24407 merge r131294 from trunk


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