Move cypher tests from JUnit to FunSuite
Cleanups
Merge pull request #2631 from davidegrohmann/kill-junit

Kill JUnit vol 3
Merge remote-tracking branch 'upstream/2.1-maint'

Conflicts:
	community/cypher/cypher-compiler-2.1/src/main/scala/org/neo4j/cypher/internal/compiler/v2_1/planner/QueryProjection.scala
	community/cypher/docs/cypher-docs/src/test/scala/org/neo4j/cypher/docgen/DocumentingTestBase.scala
Merge pull request #2639 from nawroth/master

Better LOAD CSV docs.
Removed unused imports
Merge pull request #2636 from davidegrohmann/merge-2.1-into-master

Merge 2.1 into master
Reinstates a batching page cache for batch import

Basically it's the "page cache" version of
https://github.com/neo4j/neo4j/blob/2.1.2/community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchFriendlyWindowPoolFactory.java

such that there's only one page per store in memory all the time and it
moves along with the batch importer "cursor", no other store file memory required.
Merge pull request #2640 from tinwelint/2.2-batch-page-cache

Reinstates a batching page cache for batch import
Remove incrementVersion() from LogVersionRepository since it is redundant
Changed Jetty thread calculator to take into account selector and acceptor threads
will be registered both for http and https.
Removed sysout.
Fixed string writing and reading in IoPrimitiveUtils
Removed unused methods in IoPrimitiveUtils
Added sorting of updates
Merge pull request #2655 from johan-neo/master

Changed Jetty thread calculator to take into account selector and accept...
Merge pull request #2650 from davidegrohmann/log-version-cleanup

Remove incrementVersion() from LogVersionRepository
Removes unused RecoveryLogDeserializer
Clarifies TODO comment in CommittedTransactionRepresentation
Resolves TODO in LogEntry by adding the extra header length in the toString() of Start
LogVersionRepository.incrementAndGetVersion refinements

LogVersionReposiotry.incrementAndGetVersion now throws IOException
ReadOnlyLogVersionRepository.incrementAndGetVersion will fail on
 the second call if it happens.
Merge pull request #2657 from digitalstain/master

Bunch of small refinements in kernel