More controlled flushing of pending changes as part of closing batching neo store
Merge pull request #2785 from tinwelint/2.1-fix-pbi-flush

More controlled flushing of pending changes as part of closing batching neo store
Batch importer actually flushes the current window when told to

this to support proper shutdown of the neostore, where pending changes are
flushed and writes awaited so that the store can be closed properly.
Fixes relationship augmentation when node has self-relationships
Merge pull request #2787 from tinwelint/2.1-flush-bip-windowpool

Batch importer actually flushes the current window when told to
Merge pull request #2784 from jexp/rel-augmentation-loop

Fixes relationship augmentation when node has self-relationships
Test cleanup
Merge pull request #2791 from davidegrohmann/2.1-test-cleanup

Test cleanup
Merge remote-tracking branch 'upstream/2.1-maint'

Conflicts:
	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/main/java/org/neo4j/unsafe/impl/batchimport/store/io/IoQueue.java
	community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/ParallelBatchImporterTest.java
	community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/store/BatchingWindowPoolFactoryTest.java
	community/neo4j/src/test/java/upgrade/StoreMigratorFrom19IT.java
	enterprise/ha/src/test/java/org/neo4j/ha/monitoring/RemoteRequestMonitoringIT.java
Merge pull request #2796 from davidegrohmann/merge-2.1-into-master

Merge 2.1 into master