SAK-17606 merge 312045 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@315363 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27824 merge 312278, 315157 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@315364 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-28076 merge 315339 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@315365 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-28044 merge 315110 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@315366 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-28076 revert 315365, bad merge

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@315367 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-28076 merge 315339 from trunk

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