Merging KNL-1290 - System won't start with KNL-1286


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