Merge remote-tracking branch 'upstream/master' into 2.2-merge-2.1

Conflicts:
	integrationtests/src/test/java/org/neo4j/storeupgrade/StoreUpgradeIntegrationTest.java