KNL-1297 merge 314953, 315040 from trunk

git-svn-id: https://source.sakaiproject.org/svn/assignment/branches/sakai-10.x@315360 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27939 merge 314954 from trunk

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