Merge branch '2.0-maint' into 2.1-merge-2.0

Conflicts:
	advanced/server-advanced/src/main/java/org/neo4j/server/advanced/AdvancedNeoServer.java
	advanced/server-advanced/src/test/java/org/neo4j/server/advanced/helpers/AdvancedServerBuilder.java
	community/cypher/cypher-compiler-2.0/src/main/scala/org/neo4j/cypher/internal/compiler/v2_0/commands/expressions/Expression.scala
	community/cypher/cypher-compiler-2.0/src/main/scala/org/neo4j/cypher/internal/compiler/v2_0/pipes/TopPipe.scala
	community/cypher/cypher-compiler-2.0/src/test/scala/org/neo4j/cypher/internal/compiler/v2_0/pipes/TopPipeTest.scala
	community/kernel/src/main/java/org/neo4j/kernel/EmbeddedGraphDatabase.java
	community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/api/Kernel.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/xa/NeoStoreTransaction.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/xa/NeoStoreXaDataSource.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/RWLock.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaResourceManager.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/util/FileUtils.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/store/TestNeoStore.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/nioneo/xa/WriteTransactionTest.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/transaction/xaframework/TestUpgradeOneDotFourToFiveIT.java
	community/kernel/src/test/java/org/neo4j/test/ImpermanentGraphDatabase.java
	community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java
	community/server/src/main/java/org/neo4j/server/CommunityNeoServer.java
	community/server/src/main/java/org/neo4j/server/WrappingNeoServer.java
	community/server/src/main/java/org/neo4j/server/database/CommunityDatabase.java
	community/server/src/main/java/org/neo4j/server/database/CypherExecutor.java
	community/server/src/main/java/org/neo4j/server/database/WrappedDatabase.java
	community/server/src/test/java/org/neo4j/server/database/EphemeralDatabase.java
	community/server/src/test/java/org/neo4j/server/database/TestCommunityDatabase.java
	community/server/src/test/java/org/neo4j/server/helpers/CommunityServerBuilder.java
	community/server/src/test/java/org/neo4j/server/preflight/TestPerformUpgradeIfNecessary.java
	community/server/src/test/java/org/neo4j/server/rest/paging/PagedTraverserTest.java
	community/server/src/test/java/org/neo4j/server/web/TestJetty9WebServer.java
	community/server/src/test/java/org/neo4j/server/webadmin/rest/RootServiceDocTest.java
	community/server/src/test/java/org/neo4j/server/webadmin/rest/VersionAndEditionServiceTest.java
	enterprise/com/src/main/java/org/neo4j/com/storecopy/RemoteStoreCopier.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/HighlyAvailableGraphDatabase.java
	enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdatesApplied.java
	enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseDatabase.java
	enterprise/server-enterprise/src/main/java/org/neo4j/server/enterprise/EnterpriseNeoServer.java
	enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/EnterpriseDatabaseIT.java
	enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/helpers/EnterpriseServerBuilder.java