Merge remote-tracking branch 'atmire/mixing-text-authority-entities' into...

Merge remote-tracking branch 'atmire/mixing-text-authority-entities' into w2p-61133_Merge-345-and-master

Conflicts:
	src/app/+collection-page/collection-page.component.ts
	src/app/+collection-page/collection-page.module.ts
	src/app/+item-page/field-components/metadata-uri-values/metadata-uri-values.component.ts
	src/app/+item-page/field-components/metadata-values/metadata-values.component.ts
	src/app/+item-page/simple/field-components/specific-field/item-page-field.component.html
	src/app/+item-page/simple/field-components/specific-field/uri/item-page-uri-field.component.html
	src/app/+search-page/search-service/search.service.ts
	src/app/core/core.module.ts
	src/app/core/data/base-response-parsing.service.ts
	src/app/core/data/data.service.ts
	src/app/core/data/request.service.spec.ts
	src/app/core/metadata/metadata.service.spec.ts
	src/app/core/shared/dspace-object.model.ts
	src/app/core/shared/metadatum.model.ts
	src/app/core/shared/operators.ts
	src/app/core/shared/resource-type.ts
	src/app/shared/object-list/item-list-element/item-list-element.component.html
	src/app/shared/object-list/item-list-element/item-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.html
	src/app/shared/object-list/search-result-list-element/item-search-result/item-search-result-list-element.component.spec.ts
	src/app/shared/object-list/search-result-list-element/search-result-list-element.component.ts
	src/app/shared/services/route.service.ts
	src/app/shared/shared.module.ts