KNL-1060 merge trunk r123045

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