SAK-27489 merge r310790,310791,310792 from trunk


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