A note to indicate you can't run schema commands on the slave
Fix property ownership revisit bug in ConsistencyChecker

The consistency checker would mistakenly think that a previously determined owner was a duplicate of itself, when `consistency_check_property_owners` was enabled, leading to many false positives.

This fixes #3275
Merge pull request #3364 from chrisvest/2.1-consistency-ownership-revisit

Fix property ownership revisit bug in ConsistencyChecker
adding two methods to HA GDB Factory that override the behavior of the GDB Factory
Document the Neo4j Harness library for testing unmanaged extensions
Make ExecutionEngine available to users of Unmanaged Extensions.

- Small doc change to show how to get ExecutionEngine.
Merge pull request #3346 from mneedham/no-schema-on-slave

A note to indicate you can't run schema commands on the slave
Remove the Java5 compatibility service loader.

It should never be used anyway, since we now depend on Java 7.
Merge pull request #3368 from jakewins/2.1-harnessdoc

Document the Neo4j Harness library for testing unmanaged extensions
Simplified the way separate header is extracted in multi-file case

in the batch importer, where multiple files are seen as one Readable, and
so the header is always extracted from the first line of the data stream.
Although there's still support for getting the header from a completely
different source.
Moved generic option interpretation into Args
Remove our own service loader implementation

It is most likely never used.
Improvements for plan description output.

- Always print the version on top of the description, never in the "Other" column.
- Expand outputs (from)-[:type]->(to) in "Other" column.
- Remove all unnamed identifiers in the printed description.
Abbreviate common connection closed error.

When the client closes a connection to the server before recieving the full
reply, the server currently prints a lengthy stack trace to the log. This
stack trace is not helpful, because we already do the right thing here.

Replace stack trace with one-line log message noting the client closed the
connection.
Merge pull request #3370 from jakewins/2.1-ee-server

Make ExecutionEngine available to users of Unmanaged Extensions.
Merge branch '2.1-maint'

Conflicts:
	community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/ExecutionOrderIntegrationTest.java
	community/consistency-check/src/test/java/org/neo4j/consistency/checking/full/FullCheckIntegrationTest.java
	community/server-examples/LICENSES.txt
	community/server-examples/NOTICE.txt
	community/server/src/main/java/org/neo4j/server/AbstractNeoServer.java
Merge pull request #3376 from chrisvest/2.2-remove-legacy-service-loader

Remove the Java5 compatibility service loader.
Fixed issue with cancelling long running queries in server.

JsonGenerators were not properly closed in finally blocks which lead to
malformed json when queries were cancelled by the user.
Merge pull request #3385 from pontusmelke/malformed-json

Fixed issue with cancelling long running queries in server.
Merge remote-tracking branch 'upstream/2.0-maint' into 2.1-maint