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

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/api/exceptions/schema/SchemaKernelException.java