KNL-1314 Merge 316006 from trunk



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