KNL-1299 merge 315331 from trunk

git-svn-id: https://source.sakaiproject.org/svn/kernel@315359 66ffb92e-73f9-0310-93c1-f5514f145a0a
KNL-1297 merge 314953, 315040 from trunk

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