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'