KNL-1112 merge r128467 from trunk


git-svn-id: https://source.sakaiproject.org/svn/kernel@130473 66ffb92e-73f9-0310-93c1-f5514f145a0a
SAK-23887 merge r129436 from trunk


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