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

Conflicts:
	community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/RelationshipEncoderStep.java
	community/neo4j/src/test/java/upgrade/StoreUpgraderTest.java