SAK-22797 merge 307752 to 10.x

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

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