SAK-26276 merge 309861 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@311083 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-22675 merge 310102 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@311086 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-26343 merge 310752 to 10.x

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