Merge branch 'master' into rollinglogs

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/impl/storemigration/StoreMigrator.java
	community/neo4j/src/test/java/upgrade/StoreMigratorFrom19IT.java
	community/server/src/main/java/org/neo4j/server/CommunityNeoServer.java
	community/server/src/main/java/org/neo4j/server/WrappingNeoServer.java
	enterprise/backup/src/main/java/org/neo4j/backup/BackupTool.java
	enterprise/com/src/main/java/org/neo4j/com/storecopy/StoreCopyClient.java