Restore the change to make the loading of IBM messages idempotent, this time:
  * Keeping the stubbing and production code in sync
  * Not creating a category unless we have had to create the messages.