Remove conflicting dependencies.
Do not swallow exceptions.
Merge pull request #3446 from thobe/2.1-dependencies

Resolve conflicting dependencies.
Properly closes logging and puts test files in proper places

Problems probably only visible on Windows.

Conflicts:
	community/neo4j-harness/src/main/java/org/neo4j/harness/internal/InProcessServerBuilder.java
	community/neo4j-harness/src/main/java/org/neo4j/harness/internal/InProcessServerControls.java
Merge branch '2.1' into branch '2.2'

Conflicts:
	community/cypher/cypher-compiler-2.2/pom.xml
	community/cypher/cypher/pom.xml
	community/cypher/pom.xml
	community/graphviz/pom.xml
	enterprise/com/src/test/java/org/neo4j/com/storecopy/RemoteStoreCopierTest.java
	pom.xml
Merge branch '2.1' into branch '2.2'
Debug logging of cluster members state
Increase the default lock-stripe factor for PagedFiles

This reduces the lock contention on concurrent page faulting.
Load testing in realistic scenarios have shown that 256 locks are too few, and that 1024 is a lot better.
This increases the memory pressure that each mapped file puts on the system, so to counter this, the initial size of each map in the translation tables have been reduced from 32 to 8.
Cleaned up code
Split SingleRow plans into SingleRow and Argument

The logical plan SingleRow now signifies a plan that produces a single empty row.
When what we mean is the argument on the RHS of an Apply, the logical plan Argument
is used instead.
Conversely, NullPipe is split into SingleRowPipe and ArgumentPipe to make this difference clear.
Doesn't print stack trace for illegal provided arguments to import tool
Fix for broken test in 258a14a114a37460767e1ad70f621b4365bc5a6a
Merge pull request #3461 from systay/argumentPlan

Clean up of code around NullPipe, SingleRow et al
Don't use exceptions for control flow.
Merge pull request #3448 from chrisvest/2.2-pagecache-stripe

Increase the default lock-stripe factor for PagedFiles
Updated to a more recent version of IdMapper/StringEncoder/ParallelSort

and made some restructuring around how to calculate radix, since there are
two versions of it, one for longs and one for strings.
Also fixed an IntArray consurrency issue where multiple threads could
change the same underlying long, even if they were actually changing two
different nearby ints. So IntArray is now only an interface on top of
LongArray.
Removed auto-detection of long/string -> long id mapping

and instead provides user option to control that. "string" is always fine,
but an advanced user can provide "long" or "actual" for certain scenarios
for some gained performance.
Merge pull request #3458 from lutovich/2.2-additional-logging-in-cluster-members

Debug logging of cluster members state
Merge pull request #3462 from chrisvest/2.2-no-exception-control-flow

Don't use exceptions for control flow.
Merge pull request #3455 from tinwelint/2.2-bip-updated-idmapper

Updated to a more recent version of IdMapper/StringEncoder/ParallelSort