Merge remote-tracking branch 'upstream/2.1-maint'

Conflicts:
	community/consistency-check/src/test/java/org/neo4j/consistency/store/StoreAssertions.java
	community/kernel/src/main/java/org/neo4j/kernel/AutoConfigurator.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/api/KernelTransactionImplementation.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/cache/BridgingCacheAccess.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/locking/community/RWLock.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/StoreFactory.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/TokenStore.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreMigrator.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v19/Legacy19Store.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v19/LegacyCommandReader.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/legacystore/v19/LegacyLogIoUtil.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaResourceManager.java
	community/kernel/src/test/java/org/neo4j/kernel/AutoConfiguratorTest.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/index/DummyIndexExtensionFactory.java
	community/neo4j/src/test/java/upgrade/StoreMigratorFrom19IT.java
	community/server/src/docs/ops/server-configuration.asciidoc
	community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java
	community/server/src/test/java/org/neo4j/server/preflight/TestPerformUpgradeIfNecessary.java
	community/udc/src/main/java/org/neo4j/ext/udc/impl/UdcKernelExtension.java
	community/udc/src/test/java/org/neo4j/ext/udc/impl/PingerTest.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/transaction/CommitPusher.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/transaction/MasterTxIdGenerator.java
	enterprise/ha/src/test/java/org/neo4j/ha/upgrade/RollingUpgradeIT.java
	enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterTest.java
	integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeTest.java
	packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/conf/neo4j.properties
	packaging/standalone/standalone-community/src/main/distribution/text/community/conf/neo4j.properties
	packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/conf/neo4j.properties