Fix: merge must fail when trying to create 2 nodes with same id but different labels (e.g., MERGE (a: Foo)-[r:KNOWS]->(a: Bar))
Merge pull request #2317 from davidegrohmann/2.0-maint

Fix: merge must fail when trying to create 2 nodes with same id but different labels
added script to detect unauthorized contributors
Use latest version of scala-maven-plugin
fix for TopPipe with duplicate values
Make sure old icons aren't used in the manual.
Merge pull request #2332 from jexp/top-n-fix

fix for TopPipe with duplicate values
Merge pull request #2335 from nawroth/2.0-maint

Make sure old icons aren't used in the manual
Merge pull request #2329 from davidegrohmann/scala-maven-plugin-bump

Use latest version of scala-maven-plugin
Documentation fixes.
Merge pull request #2334 from nawroth/master

Documentation fixes
Merge remote-tracking branch 'upstream/2.0-maint'

Conflicts:
	community/cypher/cypher-compiler-2.0/src/main/scala/org/neo4j/cypher/internal/compiler/v2_0/pipes/ExecuteUpdateCommandsPipe.scala
	community/cypher/cypher-compiler-2.0/src/main/scala/org/neo4j/cypher/internal/compiler/v2_0/pipes/TopPipe.scala
	community/cypher/cypher-compiler-2.0/src/test/scala/org/neo4j/cypher/internal/compiler/v2_0/pipes/TopPipeTest.scala
	community/cypher/cypher/CHANGES.txt
	community/cypher/cypher/src/test/scala/org/neo4j/cypher/internal/compiler/v2_0/ErrorMessagesTest.scala
Make query graphs handle WITH
Add inlineProjections, an AST rewriter that inlines projections where possible

o Also make sure that the AST only contains AliasedReturnItems when planning
o Remove WITH * when building Query Graph
o Removed commands.ReturnItem.renamed
o Removed inlineNamedPaths (replaced by inlineProjections)
o Fix OptionalExpandPipe to emit nulls when given a null identifier
o Introduce AstConstructionTestSupport
o Introduce IsAggregate, containsAggregate
Make AvailabilityGuard available through DependencyResolver
Normalize predicates before plan building

To plan predicate selection well, predicates
are now rewritten to conjunctive normal form
before planning starts.

Another difference is that And and Or expressions
are replaced with Ands and Ors so these can be
worked with as collections instead of trees.
Merge pull request #2336 from boggle/ronja-with

Inlining of expressions and handling WITH in the query graph
Merge pull request #2328 from systay/boolean-normalization

Normalize predicates before plan building
testing anonymous contributions: adding a dot
testing anonymous commits: changed a comment