SAK-23825 merge 310806, 310807, 311287 to 10.x

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