Merge branch 'neo4j/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/main/scala/org/neo4j/cypher/internal/executionplan/builders/ColumnFilterBuilder.scala
	community/cypher/src/main/scala/org/neo4j/cypher/internal/executionplan/builders/EmptyResultBuilder.scala
	community/cypher/src/main/scala/org/neo4j/cypher/internal/executionplan/builders/ExtractBuilder.scala
	community/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTest.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/pom.xml
	community/licensecheck-config/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/pom.xml
	community/server/src/docs/dev/rest-api/cypher.asciidoc
	community/shell/pom.xml
	community/shell/src/test/java/org/neo4j/shell/ShellDocTest.java
	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/neo4j-enterprise/pom.xml
	enterprise/pom.xml
	enterprise/server-enterprise/pom.xml
	manual/pom.xml
	packaging/installer-linux/pom.xml
	packaging/installer-qa/pom.xml
	packaging/installer-windows/pom.xml
	packaging/pom.xml
	packaging/qa/pom.xml
	packaging/standalone/pom.xml
	packaging/standalone/standalone-advanced/pom.xml
	packaging/standalone/standalone-community/pom.xml
	packaging/standalone/standalone-enterprise/pom.xml
	pom.xml
	testing-utils/pom.xml