Separate boss and worker executors in Client
Oficially talk about 'Import' not 'Batch Import'
Merge pull request #3417 from tinwelint/2.2-rename-import-tool

Oficially talk about 'Import' not 'Batch Import'
Fix potential concurrency issue in ProjectedPath

Also improves error messages in PathImpl to track down a LDBC issue
Cardinality model updates

* Preserve known labels when looking at sub queries
* Folding over PlannerQuery rather than only looking a LogicalPlans for QueryHorizon
Refactored cardinality tests
Merge pull request #3420 from boggle/2.2-path-projections

Fix potential concurrency issue in ProjectedPath
Merge pull request #3422 from systay/cardinality-work

Cardinality work
Added missing license.
Fix RebuildCountsTest on Windows

- it was caused by a problem with non absolute path in the EphemeralFileSystemAbstraction
Fix test errors
Merge pull request #3412 from lutovich/1.9-flaky-TestCommunication

Separate boss and worker executors in Client
Merge remote-tracking branch 'upstream/1.9-maint' into 2.0-maint

Conflicts:
	enterprise/com/src/main/java/org/neo4j/com/Client.java
Merge branch '2.0-maint' into 2.1-maint
Merge branch '2.1-maint'

Conflicts:
	enterprise/com/src/main/java/org/neo4j/com/Client.java
Fixed relationship id generator issue in multiple input groups

Previously multiple input groups would have the id sequence of
relationships restarted from 0.
Merge pull request #3428 from tinwelint/2.2-multi-rel-groups-id-issue

Fixed relationship id generator issue in multiple input groups
Comments by CG
FIx deprecation TODO
More clanup and TODOs