The core NLKD adjustments to pre-existing code.

Signed-Off-By: Jan Beulich <jbeulich@novell.com>

(actual patch attached)