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
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 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