Fixed conflicts with new metadata map

...edit-in-place-field/edit-in-place-field.component.spec.ts

...data/edit-in-place-field/edit-in-place-field.component.ts

...t-item-page/item-metadata/item-metadata.component.spec.ts

...e/edit-item-page/item-metadata/item-metadata.component.ts

...ge/modify-item-overview/modify-item-overview.component.ts

...ents/metadata-uri-values/metadata-uri-values.component.ts

...d-components/metadata-values/metadata-values.component.ts

src/app/+item-page/full/full-item-page.component.ts

src/app/+search-page/normalized-search-result.model.ts

src/app/+search-page/search-result.model.ts

src/app/core/cache/models/normalized-dspace-object.model.ts

src/app/core/data/search-response-parsing.service.ts

src/app/core/eperson/models/eperson.model.ts

src/app/core/metadata/metadata.service.spec.ts

src/app/core/shared/dspace-object.model.ts

src/app/core/shared/metadata.model.spec.ts

src/app/core/shared/metadata.models.ts

src/app/core/shared/metadata.utils.ts

.../shared/comcol-forms/comcol-form/comcol-form.component.ts

...p/shared/input-suggestions/input-suggestions.component.ts