Fixes compilation failures
Changed to use the correct unit for ha.zk_session_timeout.
fix store-file handling as parameter in BatchInserterImpl, backport from 1.9
Merge pull request #643 from jexp/batch-insert-storedir-config

fix store-file handling as parameter in BatchInserterImpl, backport from 1.9
fixes #697 passing arrays as properties to unique node creation

by making sure all the collections in the supplied properties are converted into arrays like in other places
in the REST API

make sure to forward merge into 1.9 and 2.x
Set default replacement decision strategy to be script counting
As last resort, allow user to configure through neo4j properties
Fixes logging of errors on push requests from master
Fixes typo in method name

This is a backport of 65bfd15becfbe8e28088d11c28cdf736c26508e5
Merge pull request #704 from rickardoberg/gremlinfix

Change Gremlin script replacement strategy
Merge pull request #700 from jexp/697-array-properties-in-unique-indexes

fixes #697 passing arrays as properties to unique node creation
Create the directory of the HTTP log file, not the log file as a directory
Fixes test after last backport
Speeds up tests of AutoConfiguration.

By adding a proper unit test for testing how the AutoConfigurator configures memory mapping,
and a much smaller test than the previous integration test for making sure that auto configured values make it into the actual configuration.

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/AutoConfigurator.java
	community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/nioneo/store/DefaultWindowPoolFactory.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/core/AutoconfIT.java
Ensure that log rotation does not read excessively from the log.

Backport of b3f1be5
Updating gitignore
Fixes races condition in getSingleRelationship().

Added test that checks for duplicate entries in the iterator returned by getSingleRelationship. If the iterator contains multiple identical entries, then silently swallow any barf and return the first as the user expected.

Note: this commit is a bit of a band-aid since we really need proper isolation in the kernel. The test and the code likely should be removed in some future state.

Conflicts:
	community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeImpl.java
Removed unused parameters from method signatures.

In common with 1.9.x there are a bunch of unused parameters for methods in NodeImpl. Used safe delete to remove them.
Updated the README.
Backport of a808873, "pull storm" fix, plus bug fix 9cfb818
GraphGlobal Operations take Transaction State into account

A manual backport of a feature that is in 1.9, but not an easy cherry pick!

The NodeManager now checks for an active transaction context before returning and changed graph items on getAllNodes/getAllRels.

Added testing around NodeManager and refactored the existing tests.

Removed unused code, commented out code etc.
Specifies Java 6 when finding JAVA_HOME on OSX

This is a backport of b1f1ac28666bcf348a176d37e90f636dc5352539