KNL-1313 Merge 315849 from trunk

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