SAK-28003 merge 314787 from trunk

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

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

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

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

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