Merge branch '2.0-maint'

Conflicts:
	community/cypher/cypher-docs/src/docs/dev/java/execute-java.asciidoc
	community/embedded-examples/src/docs/dev/setup.asciidoc
	community/embedded-examples/src/docs/dev/social.asciidoc
	community/kernel/src/main/java/org/neo4j/kernel/impl/api/store/DiskLayer.java
	manual/pom.xml
	packaging/pom.xml