KNL-1254 merge 309533 to 10.x

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

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