KNL-1280 merge 310784 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel@311092 66ffb92e-73f9-0310-93c1-f5514f145a0a