SAK-26251 merge 312282, 312283, 312390 to 10.x

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