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.
Respect X-Forwarded-* when redirecting to browser
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 #2807 from cleishm/browser-redirect-x-forwarded

Respect X-Forwarded-* when redirecting to browser
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
Add test for browser redirect
Merge pull request #2822 from davidegrohmann/merge-1.9-into-2.0

Merge 1.9 into 2.0
Merge pull request #2824 from cleishm/browser-redirect-x-forwarded

Add test for browser redirect
Uses the cancellation request to replace interruption for state changing tasks

This interface captures the notion of the request to cancel a
 running task. This involves the actual checking but not the
 notification mechanism, which is application dependent.
The driver for this is properly cancelling state change in HA

Removes the use of Thread.interrupt() for cancelling the task that is
 currently switching state. Interruption had the capacity to cause
 unwanted side effects to IO operations.
The Future that is attached to the currently running task is actually
 waited for, ensuring no two threads are stepping on each other's toes
The SwitchToSlave task checks at convenient points during the store copy
 if cancellation has been requested and properly aborts, while cleaning
 up. This will be revisited
Adds comments to key methods and adjusts a test to work with the new way
 of cancelling.

Refactors master HA URI to make structure more clear

Adds two cancellation points in SwitchToSlave

Adds defensive check for switching to slave for ourselves as master

Also adds a catch clause around the get() for the Future of the
 task switching, when there is the need for cancellation
Adds a test for the added check
Merge pull request #2831 from digitalstain/1.9-cancel-state-switch

Properly cancel state switch tasks
Merge branch '1.9-maint' into 2.0-merge-1.9

Conflicts:
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/SlaveStoreWriter.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityModeSwitcher.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java
Merge pull request #2852 from tinwelint/2.0-merge-1.9

2.0 <-[:merge]- 1.9
Merge branch '2.0-maint' into 2.1-merge-2.0

Conflicts:
	enterprise/com/src/test/java/org/neo4j/com/storecopy/RemoteStoreCopierTest.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityModeSwitcher.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/SwitchToSlave.java
Merge pull request #2854 from tinwelint/2.1-merge-2.0

2.1<--merge--2.0