Merge remote-tracking branch 'dspace/master' into w2p-50632_Replace-mock-registry-service-with-implementation

Conflicts:
	src/app/app-routing.module.ts
	src/app/core/cache/response-cache.models.ts