Small bug-fix due to changes to relationship-type

Conflicts:
	resources/i18n/en.json
	src/app/shared/comcol-forms/edit-comcol-page/edit-comcol-page.component.spec.ts
	src/app/shared/shared.module.ts

Rename relationship type properties

Add header icon color variable

variables

Submission miscellaneous fixes

Remove duplicated "SearchFilterService"

Redirecting user to same page after login.

Update set-value to fix CVE-2019-10747

Removal of filtered-discovery-page in Angular

Use the improved DSpace Docker Compose files to create the ci image

Bump mixin-deep from 1.3.1 to 1.3.2

Bumps [mixin-deep](https://github.com/jonschlinkert/mixin-deep) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/jonschlinkert/mixin-deep/releases)
- [Commits](https://github.com/jonschlinkert/mixin-deep/compare/1.3.1...1.3.2

)

Signed-off-by: dependabot[bot] <support@github.com>

Convert i18n files to JSON5 format

Fix travis chrome install issue

Move item component

Merge remote-tracking branch 'atmire-git/w2p-64644_Removal-of-filtered-discovery-page' into 64644-Removal-of-filtered-discovery-page