KNL-1233 merge 308232 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@309199 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1229 merge 308507 308556 308571 308573 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@309201 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1246 merge 309073 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@309208 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1230 merge 309144 309178 to 10.x

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