KNL-1278 Merge 315470 from trunk

git-svn-id: https://source.sakaiproject.org/svn/kernel@315519 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-27846 Merge 315494 from trunk

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