Merge pull request #555 from systay/489

Fixes #489 - CREATE UNIQUE does not work as expected inside FOREACH
Serving learnRequests now sets the ConversationId properly, solves some serious bugs
Fixes error in logic on concurrent cluster creation cases. Enables corresponding test.

Discovery on which instance should start the cluster is done now properly, allowing cases where
 ourself is not included in the initial_hosts setting.

Enables test that was flaky, probably fixed by this change
DM's speedup of shortest path by shortcut
Merge pull request #558 from lassewesth/shortestpath

DM's speedup of shortest path by shortcut
Added support for X-Forwarded-Host and X-Forwarded-Proto headers to allow parameterising of links in data for hosting behind proxy servers.
Merge pull request #557 from jimwebber/master

Allow server to be deployed painlessly in behind-the-proxy use-cases.
Squashed a bug in X-F-H header handling where no port would appear as port 0. Thanks to Aseem Kishore for spotting that.
Merge pull request #561 from jimwebber/master

Squashing a bug in X-Forwarded-Host header handling.
Removed unused Locker file
Adds debug logging custom-logback.xml by default to enterprise
Adds conf directory in classpath to get rid of logback complaints
Fixes #450 - Predicates in WHERE are not evaluated correctly for certain patterns
Merge branch 'master' into 2.0

Conflicts:
	community/cypher/CHANGES.txt
	community/cypher/src/test/java/org/neo4j/cypher/javacompat/JavaQuery.java
	community/cypher/src/test/scala/org/neo4j/cypher/ExecutionEngineTest.scala
	community/kernel/src/main/java/org/neo4j/kernel/impl/api/UpdateMode.java
	cypher-plugin/src/test/java/org/neo4j/server/plugin/cypher/CypherPluginTest.java