Verify split-brain state in test
Merge remote-tracking branch 'origin/feature/improve_zen' into feature/zen/add-jepsen-test

Conflicts:
	src/test/java/org/elasticsearch/discovery/DiscoveryWithNetworkFailuresTests.java
Remove some randomness so test is easier to debug
Merge remote-tracking branch 'origin/feature/improve_zen' into feature/zen/add-jepsen-test