SAK-25708 merge 306802 307470 307471 to 10.x

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

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