post merge fixes


ndb/include/mgmapi/ndbd_exit_codes.h:
  post merge
ndb/src/kernel/blocks/dbdih/DbdihMain.cpp:
  post merge
ndb/src/kernel/blocks/dblqh/DblqhMain.cpp:
  post merge
ndb/src/kernel/error/ndbd_exit_codes.c:
  post merge
ndb/tools/desc.cpp:
  post merge