Breaking cyclic dependency in IndexManager wrt AutoIndexers
Revert "Revert "More parallellization in the batch importer""

This reverts commit 45b41deb576ca39663cac9dee8cc391421ab764d.
Fix inconsistent behavior in diffsets on remove/add combination.

Previously, remove+add would result in an item added, while add+remove
would result in no net changes. This fixes this inconsistency, leading to net
no changes in both cases.

This resolves two bugs in property and label changing, where one would remove
and add the same label or property multiple times in the same transaction.
Introduce CypherOptionParser
Switch top-level CypherCompiler to using CypherOptionParser

o Rename Prepared to ParsedQuery and clean up interface
o Fix CypherOptionParser's parsing of versions
Extract common code into Base
Ring changed to SimplePool, which does not rely on acquire/release ordering
Merge pull request #2757 from systay/pre-parser

Introduce a pre-parser in preparation for PROFILE/EXPLAIN
Removed IRC link, updated events URL.
Merge pull request #2748 from lutovich/2.1-maint

Fix flaky ParallelBatchImporterTest
Merge pull request #2751 from jakewins/2.1-diffset-correct

Fix inconsistent behavior in diffsets on remove/add combination.
Fix cypher compiler 2.1 dependency version
Merge 2.1-maint into master
Merge pull request #2764 from systay/2.1-merge-into-master

2.1 merge into master
Merge pull request #2763 from davidegrohmann/fix-cypher-2.1-compiler-version

Fix cypher compiler 2.1 dependency version
Merge branch '2.1-maint' into 2.1-merge

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/api/state/TxStateImpl.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/xa/NeoStoreTransaction.java
	community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporter.java
	community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingNeoStore.java
	community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchingWindowPoolFactory.java
	community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java
	community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/store/BatchFriendlyWindowPoolFactoryTest.java
Update Cypher docs dependency to Cypher compiler
Introduced PlanType and refactored ExecutionWorkflowBuilder
Added EXPLAIN to the execution engine and compiler
Merge pull request #2743 from davidegrohmann/break-cyclic-dep-index-mngr

Breaking cyclic dependency in IndexManager wrt AutoIndexers