Merge "kgdb: fixups"