KNL-1137 merge 306428 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@309232 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23598 merge 308963 to 10.x

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