Merge branch 'master' into 2.0

Conflicts:
	community/cypher/CHANGES.txt
	community/cypher/src/docs/dev/ql/create/index.asciidoc
	community/kernel/CHANGES.txt
	community/kernel/src/main/java/org/neo4j/kernel/InternalAbstractGraphDatabase.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/core/NodeManager.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/core/PropertyIndexManager.java
	community/kernel/src/main/java/org/neo4j/kernel/impl/core/RelationshipTypeHolder.java
	community/server/CHANGES.txt
	community/shell/src/main/java/org/neo4j/shell/StartClient.java
	community/udc/src/test/java/org/neo4j/ext/udc/impl/UdcExtensionImplTest.java
	enterprise/ha/src/main/java/org/neo4j/kernel/ha/cluster/HighAvailabilityModeSwitcher.java
	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