Merge remote-tracking branch 'origin/master' into 2.0

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
	community/server-api/src/main/java/org/neo4j/server/rest/repr/RepresentationType.java
	community/server/src/main/java/org/neo4j/server/rest/repr/ServerListRepresentation.java
	community/server/src/main/java/org/neo4j/server/rest/web/RestfulGraphDatabase.java
	community/server/src/test/java/org/neo4j/server/WrappingNeoServerBootstrapperDocIT.java
	community/server/src/test/java/org/neo4j/server/rest/paging/PagedTraverserDocIT.java
	community/server/src/test/java/org/neo4j/server/rest/web/PagingTraversalTest.java
	community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabasePagedTraversalTest.java
	community/server/src/test/java/org/neo4j/server/rest/web/RestfulGraphDatabaseTest.java
	packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j-backup
	packaging/standalone/src/main/distribution/shell-scripts/bin/neo4j-shell
	packaging/standalone/src/main/distribution/shell-scripts/bin/utils
	packaging/standalone/standalone-advanced/src/main/distribution/text/advanced/CHANGES.txt
	packaging/standalone/standalone-community/src/main/distribution/text/community/CHANGES.txt
	packaging/standalone/standalone-enterprise/src/main/distribution/text/enterprise/CHANGES.txt