Fixed a store migration test that was disabled for Windows
Merge branch '1.9-maint' into 2.0-maint

Conflicts:
	community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTestIT.java
Merge branch '2.0-maint'

Conflicts:
	community/kernel/src/test/java/org/neo4j/kernel/impl/storemigration/UpgradableDatabaseTestIT.java