Changes ClusterSettings.server_id to be an InstanceId instead of an integer
Merge pull request #2353 from digitalstain/1.9-maint

Changes ClusterSettings.server_id to be an InstanceId instead of an integer
Merge branch '1.9-maint' into 2.0-maint

Conflicts:
	enterprise/cluster/src/main/java/org/neo4j/cluster/ClusterSettings.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/SlaveStoreWriter.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/zoo/Machine.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/zoo/ZooClient.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/zoo/ZooKeeperHighAvailabilityEvents.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/zoo/ZooKeeperMachine.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/com/master/MasterImpl.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/transaction/TxIdGeneratorModeSwitcher.java
	enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java
	enterprise/ha/src/test/java/org/neo4j/ha/TestSlaveOnlyCluster.java
	enterprise/ha/src/test/java/org/neo4j/ha/TransactionConstraintsIT.java
	enterprise/ha/src/test/java/org/neo4j/kernel/ha/TxPushStrategyConfigIT.java
	enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterManager.java
	enterprise/ha/src/test/java/slavetest/TestStoreCopy.java
Merge pull request #2365 from digitalstain/2.0-maint

Merge branch 1.9-maint into 2.0-maint