use neo4j-server.properties in gui, allowing user to edit it
Merge pull request #1465 from systay/merge-with-index

Fix problem when using MERGE and indexes exist
Proper cleanup on failed transaction commit in MasterImpl, added more logging.
Debug logging for channel.acquire in Client.java
Cypher null docs: fixing one doc bug and AsciiDoc table syntax.
Adds cluster wait conditions after shutdown in IndexOperationsIT
Remove the OSGi example, the test has been ignored for a long time.
Merge pull request #1470 from boggle/2.0-node-get-unique

Fix locking of nodeGetUnique
Fixed #1471 - SETting a relationship to a map value fails
Merge pull request #1483 from chrisvest/better-upgrade-error-messages

Better error messages when upgrading unclean store
Merge pull request #1485 from systay/1471

Fixed #1471 - SETting a relationship to a map value fails
Consistency checker: check that nodes are indexed.

o Directly use PropertyStore instead of the RecordAccess API
  to reduce code duplication at the expense of deferred check mechanism.
  This could prove to be an expensive check because of the need to read
  whole property chain for each node.
o Add parameters for turning off label scan store and index checks.
o Check uniqueness of unique indexes.
o Keep index accessors open for duration of entire consistency check.
o Extract tasks into their own class.
Consistency checker: use last committed transaction id as baseline for injected transactions.
Consistency checker: unwind nested test setup.
Test and fix for failing to start transaction in MasterImpl.
Merge pull request #1484 from akollegger/desktop-server-config

neo4j-desktop use of server properties
Changes the user under which the neo4j service runs as, under Debian

The file /etc/default/neo4j will be sourced and the NEO_USER variable
 discovered, defaulting to the value "neo4j". That is the user that
 the postinstall scripts assigns ownership of the installation files
 and now this is the user that the start-stop-daemon will start the
 process as.

 Also with refactorings in the init script, and removal of duplicate
 copies of the init script.

Fixes #1348 (https://github.com/neo4j/neo4j/issues/1348)

Refactorings to init script.

Refactoring: remove duplicate init scripts.
Fix for https://github.com/neo4j/neo4j/issues/1275 (delete index does not replicate to other cluster nodes)
Stop the init script from returning 1

So as not to upset the prerm and postinst scripts.
Merge pull request #1456 from apcj/2.0-ccheck-node-to-indexes

Consistency checker: check that nodes are indexed.