SAK-25575 merge 308283 to 10.x

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

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