Merge branch 'master' into 2.2-merge-2.1

Conflicts:
	community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/MigrationTestUtils.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTest.java
	community/neo4j/src/test/java/recovery/TestRecoveryScenarios.java
	community/neo4j/src/test/java/upgrade/StoreMigratorIT.java
	enterprise/ha/src/test/java/org/neo4j/metrics/MetricsLogExtension.java