Merge branch 'CST-6565' of bitbucket.org:4Science/dspace-angular into CST-6565

� Conflicts:
�	src/app/shared/cookies/browser-klaro.service.ts

Author: atarix83

src/app/shared/cookies/browser-klaro.service.ts

@@ -84,7 +84,7 @@ export class BrowserKlaroService extends KlaroService {
       this.configService.findByPropertyName(this.GOOGLE_ANALYTICS_KEY)
         .pipe(
           getFirstCompletedRemoteData(),
-          map(remoteData=> this.mapInvalidConfiguration(remoteData, this.GOOGLE_ANALYTICS_SERVICE_NAME)),
+          map(remoteData => this.mapInvalidConfiguration(remoteData, this.GOOGLE_ANALYTICS_SERVICE_NAME)),
           take(1)
         );