KNL-1028 Applying patch related to SAK-23304, adding some constants



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