Ensure i18n keys are filled correctly ref #7322

- There were outstanding issues related to the object
  builder and removing the nested set stuff from digital
  objects. We'll avoid rebuilding the model for now until
  we can address these things in a separate issue for 2.2.x.