Merge branch '2.0-maint'

Conflicts:
	community/cypher/cypher-compiler-2.0/src/main/scala/org/neo4j/cypher/internal/compiler/v2_0/commands/Predicate.scala
	community/cypher/cypher/CHANGES.txt
	community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeImpl.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipIterator.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeImplTest.java