KNL-1310 Merge 315736 from trunk

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@315779 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1194 Merge 315738 from trunk

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