Revert "Revert "BF: changes needed for new kb event field defs""

This reverts commit 7393e9e7ef930456a1ee1afc6d9ff63e8577e42b.