Remove conflicting dependencies.
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