KNL-1007 merge trunk r118019

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@122044 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1037 merge trunk r121463

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