Draft: keymgr: Config improvements

This MR contains some config changes/improvements I found myself making while working on #903 (closed).

Note: Enabling Hide whitespace changes makes this somewhat easier to review.