Merge branch '1.9-maint' into master

Conflicts:
	advanced/management/pom.xml
	advanced/neo4j-advanced/pom.xml
	advanced/pom.xml
	advanced/server-advanced/pom.xml
	community/cypher/pom.xml
	community/cypher/src/docs/dev/general/introduction.asciidoc
	community/cypher/src/test/scala/org/neo4j/cypher/docgen/PatternTest.scala
	community/embedded-examples/pom.xml
	community/graph-algo/pom.xml
	community/graph-matching/pom.xml
	community/graphviz/pom.xml
	community/jmx/pom.xml
	community/kernel/CHANGES.txt
	community/kernel/pom.xml
	community/lucene-index/pom.xml
	community/neo4j-community/pom.xml
	community/neo4j/pom.xml
	community/pom.xml
	community/server-api/pom.xml
	community/server-examples/pom.xml
	community/server-plugin-test/pom.xml
	community/server/pom.xml
	community/server/src/main/java/org/neo4j/server/web/Jetty6WebServer.java
	community/shell/pom.xml
	community/udc/pom.xml
	cypher-plugin/pom.xml
	enterprise/backup/pom.xml
	enterprise/cluster/pom.xml
	enterprise/com/pom.xml
	enterprise/consistency-check/pom.xml
	enterprise/enterprise-performance-tests/pom.xml
	enterprise/ha/pom.xml
	enterprise/ha/src/test/java/org/neo4j/test/ha/ClusterManager.java
	enterprise/neo4j-enterprise/pom.xml
	enterprise/pom.xml
	enterprise/server-enterprise/pom.xml
	enterprise/server-enterprise/src/test/java/org/neo4j/server/enterprise/StandaloneClusterClientIT.java
	manual/pom.xml
	manual/src/community/contributors.asciidoc
	packaging/installer-linux/installer-debian/README.txt
	packaging/installer-linux/pom.xml
	packaging/installer-qa/pom.xml
	packaging/pom.xml
	packaging/standalone/pom.xml
	packaging/standalone/standalone-advanced/pom.xml
	packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/CHANGES.txt
	packaging/standalone/standalone-community/pom.xml
	packaging/standalone/standalone-community/src/main/distribution/text/community/CHANGES.txt
	packaging/standalone/standalone-enterprise/pom.xml
	packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/CHANGES.txt
	pom.xml