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...
Merge pull request #2723 from boggle/2.1-maint

Do not check relationship uniqueness for relationships with different ty...
Revert "More parallellization in the batch importer"

This reverts commit fd9c7eebb9206b82172676e41bdbb9bd5be4b541.

Conflicts:
	community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/ParallellBatchImporter.java
	community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java
Updates changelogs for 2.1.3
Merge pull request #2727 from davidegrohmann/2.1-parallel-batch-import-opt-revert

Revert "More parallellization in the batch importer"
Merge pull request #2728 from digitalstain/2.1-2.1.3-changelogs

Updates changelogs for 2.1.3
Move use of nodeManager.isDeleted in DeleteEntityAction to QueryContext API

signed-off-by: Jakub Wieczorek <jakub.wieczorek@neotechnology.com>