KNL-1108 KNL-1109 KNL-1110
Unsaved changes from previous commit.


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