KNL-1211 merge 307531 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel@308831 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1240 merge 308508 308511 308512 to 10.x

git-svn-id: https://source.sakaiproject.org/svn/kernel@308846 66ffb92e-73f9-0310-93c1-f5514f145a0a