Tagging for version 1.9.7
Back to development version.
Uses TestDirectory
Merge branch '1.9-maint' into 2.0-maint

Conflicts:
	community/kernel/src/test/resources/org/neo4j/kernel/impl/storemigration/legacystore/exampledb/neostore.nodestore.db
	community/kernel/src/test/resources/org/neo4j/kernel/impl/storemigration/legacystore/exampledb/neostore.propertystore.db
	community/kernel/src/test/resources/org/neo4j/kernel/impl/storemigration/legacystore/exampledb/neostore.relationshipstore.db
	community/kernel/src/test/resources/org/neo4j/kernel/impl/storemigration/legacystore/exampledb/neostore.relationshiptypestore.db
	community/kernel/src/test/resources/org/neo4j/kernel/impl/storemigration/legacystore/propkeydupdb/neostore.relationshipstore.db
	community/kernel/src/test/resources/org/neo4j/kernel/impl/storemigration/legacystore/propkeydupdb/neostore.relationshiptypestore.db
	community/server/src/test/resources/org/neo4j/server/preflight/legacystore/exampledb/neostore.nodestore.db
	community/server/src/test/resources/org/neo4j/server/preflight/legacystore/exampledb/neostore.propertystore.db
	community/server/src/test/resources/org/neo4j/server/preflight/legacystore/exampledb/neostore.relationshipstore.db
	community/server/src/test/resources/org/neo4j/server/preflight/legacystore/exampledb/neostore.relationshiptypestore.db
	enterprise/ha/src/test/java/org/neo4j/ha/TestSlaveOnlyCluster.java
Merge branch '2.0-maint'

Conflicts:
	enterprise/ha/src/test/java/org/neo4j/ha/TestSlaveOnlyCluster.java