Get rid of warnings around snippets in the ACL example.
Merge pull request #2792 from nawroth/1.9-maint

Get rid of warnings around snippets in the ACL example.
Correctly quote arguments to tr
Reset of election version is 1 and not 0 apparently
Remove use of non-versioned voting

Conflicts:
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/atomicbroadcast/multipaxos/context/ClusterContextImpl.java
Removed backward compatibility test
Make sure we always send VersionedVoteData by asking with proper VoteRequests

Conflicts:
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/election/ElectionState.java
Merge pull request #2808 from cleishm/tr-quote-fix

Correctly quote arguments to tr
Merge pull request #2813 from digitalstain/1.9-versioned-election

Backport of the removal of versioned election compatibility
Merge remote-tracking branch 'upstream/1.9-maint' into 2.0-maint

Conflicts:
	enterprise/cluster/src/main/java/org/neo4j/cluster/protocol/election/ElectionState.java
Merge pull request #2822 from davidegrohmann/merge-1.9-into-2.0

Merge 1.9 into 2.0