Merge remote-tracking branch 'origin/master'

Conflicts:
	community/cypher/src/main/scala/org/neo4j/cypher/internal/parser/v2_0/Expressions.scala
	community/cypher/src/test/scala/org/neo4j/cypher/CypherParserTest.scala
	community/cypher/src/test/scala/org/neo4j/cypher/ErrorMessagesTest.scala
	community/kernel/src/test/java/org/neo4j/kernel/TestGuard.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/core/NodeImplTest.java