SAK-25847 merge 307175 307754 to 10.x

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