KNL-1267 merge 310557 from trunk

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@313736 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23795 merge 311749, 311751, 311752, 311753 from trunk

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