SAK-24425 merge r130216 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/assignment-2.9.x@308115 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25345 merge r131297,132079 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/assignment-2.9.x@308117 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23591 merge r124121 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/assignment-2.9.x@308119 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-24199 merge r130486 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/assignment-2.9.x@308120 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25265 merge r133937,202613 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/assignment-2.9.x@308121 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23472 merge r134317 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/assignment-2.9.x@308122 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23390 merge r130977 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/assignment-2.9.x@308123 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-25312 merge r307145 from trunk

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