Fix shadowing issues with aggregation in Ronja

Signed-off-by: Stefan Plantikow <stefan.plantikow@neotechnology.com>
Fix: Correctly isolate aggregates from expressions that introduce interior scopes (reduce, fitler, extract, comprehensions)

signed-off-by: Jakub Wieczorek <jakub.wieczorek@neotechnology.com>
Merge pull request #2717 from jakub-/ronja-aggregation

Fix shadowing issues with aggregation in Ronja
Merge pull request #2720 from boggle/2.1-maint

Fix: Correctly isolate aggregates from expressions that introduce interi...
Do not check relationship uniqueness for relationships with different types

signed-off-by: Jakub Wieczorek <jakub.wieczorek@neotechnology.com>
Merge pull request #2723 from boggle/2.1-maint

Do not check relationship uniqueness for relationships with different ty...
Merge pull request #2724 from neo4j/2.1-maint

2.1 maint -> master