KNL-1058 merge r122934 from trunk

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