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

Conflicts:
	community/kernel/CHANGES.txt
	community/kernel/src/main/java/org/neo4j/kernel/impl/transaction/xaframework/XaLogicalLog.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/util/Neo4jJobScheduler.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/util/Neo4jJobSchedulerTest.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/HighlyAvailableGraphDatabase.java
	enterprise/ha/src/test/java/org/neo4j/ha/TestPullUpdates.java
Merge pull request #2535 from chrisvest/2.2-merge-2.1

2.2 merge 2.1
Merge branch '2.1-maint'

Conflicts:
	community/kernel/src/main/java/org/neo4j/unsafe/impl/batchimport/store/BatchFriendlyWindowPoolFactory.java
	community/kernel/src/test/java/org/neo4j/unsafe/impl/batchimport/store/BatchFriendlyWindowPoolFactoryTest.java