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

Conflicts:
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/transaction/TransactionPropagator.java