KNL-1061, KNL-1065 merge trunk r123378, 123381, 123409

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