KNL-1250 merge 309889 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel/branches/sakai-10.x@309894 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1257 merge 309687 309871 309885 to 10.x

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