KNL-1013 merge r118374,118486,118487 from trunk

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