Merging missing commits for SAK-23472 to 2.9.x from 134462 and 134464 


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