KNL-1106 merge r129116,129117 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@308546 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1115 merge r129118 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@308547 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1116 merge r129115 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@308548 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1117 merge r129209 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@308549 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1195 merge r306861 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@308551 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1114 merge r129027 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/kernel-1.3.x@308552 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1211 merge r307531 from trunk


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