KNL-1281 merge 311671 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@311791 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1287 merge 311557 to 10.x

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