KNL-1253 merge r309525,309575,309576 from trunk


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