SAK-26349 merge 310353, 311125, 311127, 311299 to 10.x

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