Merge branch '1.9-maint'

Conflicts:
	community/cypher/src/main/scala/org/neo4j/cypher/internal/LRUCache.scala
	community/lucene-index/src/test/java/org/neo4j/index/impl/lucene/TestLuceneIndex.java
	community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java
	community/server/src/test/java/org/neo4j/server/PreflightTasksDocIT.java
	enterprise/backup/src/test/java/org/neo4j/backup/EmbeddedServer.java
	enterprise/backup/src/test/java/org/neo4j/backup/TestBackup.java
	packaging/neo4j-desktop/pom.xml
	packaging/qa/README.asciidoc
	packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/CHANGES.txt
	packaging/standalone/standalone-community/src/main/distribution/text/community/CHANGES.txt
	packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/CHANGES.txt