Upgrading to Angular 6

[...]