Merge branch '2.0-maint' into 2.1-maint

Conflicts:
	advanced/neo4j-advanced/pom.xml
	community/kernel/pom.xml
	community/kernel/src/main/java/org/neo4j/kernel/impl/api/StateHandlingStatementOperations.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/api/integrationtest/PropertyIT.java
	community/kernel/src/test/java/org/neo4j/kernel/impl/core/TestConcurrentModificationOfRelationshipChains.java
	community/neo4j-community/pom.xml
	community/neo4j/pom.xml