Merge commit 'a19322d8bb63ffd3e2288f0d5579c9ebf3080db0' into project-customization

Conflicts:
	advanced/management/pom.xml
	advanced/neo4j-advanced/pom.xml
	advanced/pom.xml
	advanced/server-advanced/pom.xml
	community/cypher/cypher-commons/pom.xml
	community/cypher/cypher-compiler-1.9/pom.xml
	community/cypher/cypher-compiler-2.0/pom.xml
	community/cypher/cypher-docs/pom.xml
	community/cypher/cypher/pom.xml
	community/cypher/pom.xml
	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-plugin-test/pom.xml
	community/server/pom.xml
	community/shell/pom.xml
	community/udc/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/cypherdoc/pom.xml
	manual/fop-pom.xml
	manual/pom.xml
	packaging/installer-linux/installer-debian/pom.xml
	packaging/installer-linux/installer-rpm/installer-rpm-advanced/pom.xml
	packaging/installer-linux/installer-rpm/installer-rpm-community/pom.xml
	packaging/installer-linux/installer-rpm/installer-rpm-enterprise/pom.xml
	packaging/installer-linux/installer-rpm/pom.xml
	packaging/installer-linux/pom.xml
	packaging/installer-qa/pom.xml
	packaging/neo4j-desktop/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
Activated incremental compile mode for cypher components.
Merge branch 'project-customization' into all-extensions