Fixes for unit-test issues caught during KERNEL_EXTRA_CHECKS testing
Authored by: m0slevin 2016-10-01
Parent: [r379]
Child: [r381]