Reset of election version is 1 and not 0 apparently
Remove use of non-versioned voting
Removed backward compatibility test
Do rolling upgrade from 2.1.2, not 2.0.3
Centralized jetty thread calc, reduced default
Leads to a performance imporvement due to less GC time, at least on some configurations, can probably be tweaked further. Calcultion is based on what "feels right" to Johan.
Remove unused core poll
Merge pull request #2611 from ragadeeshu/jettythreads

Centralised jetty thread calculation, reduced default number of threads
Merge pull request #2616 from chrisvest/2.1-merge-2.0

2.1 merge 2.0
Copy overlapping completed transactions during rotation.

During rotation we copy transactions that have not completed to the next
log. We also copy transactions that finished after the start of the
first incomplete transaction. In some cases the transaction that
finished after the start of the first incomplete transaction was started
before the start of the first incomplete transaction, in these cases the
body of that transaction needs to be found and extracted from earlier in
the log. When that code path executes it copies the transaction body
from earlier in the log to an InMemoryLogBuffer then reads the commands
of the transaction from that InMemoryLogBuffer to copy the transaction
into the new log. Reading the transaction from a buffer requires a
cursor to be created over that LogBuffer. This cursor used to be created
by reading from the underlying StoreChannel of the LogBuffer, but an
InMemoryLogBuffer does not have a StoreChannel, something that would
cause failures to rotate the log in these circumstances. Creating a
cursor only requres a ReadableByteChannel, an interface that the
InMemoryLogBuffer supports natively. This changeset solves the issue in
rotating transaction logs by introducing a new method to the LogBuffer
interface for getting only a ReadableByteChannel that
InMemoryLogBuffer can support by returning `this`, and other
implementations can support by returning the StoreChannel as before.

This changeset also updates the naming in the PartialTransactionCopier
to clarify the responsibilites of the various classes, methods, and
fields in there.
Merge pull request #2602 from rickardoberg/removenonversionedelections

Remove non-versioned elections
Upgrade CodeMirror. Fix broken search highlighting.
Merge pull request #2621 from thobe/2.1-rotation-fix

Copy overlapping completed transactions during rotation.
Minor fixes in docs, mostly around Cypher.
Merge pull request #2624 from nawroth/master

Documentation fixes
Merge branch '2.1-maint' into 2.2-merge-2.1

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/LogExtractor.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/PartialTransactionCopier.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLogTest.java
Merge branch 'master' into 2.2-merge-2.1

Conflicts:
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ClusterContextImpl.java