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

Conflicts:
	README.md
	community/cypher/CHANGES.txt
	community/kernel/CHANGES.txt
	community/server/CHANGES.txt
	community/server/src/main/java/org/neo4j/server/AbstractNeoServer.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/security/TestKeyStoreFactory.java
	community/server/src/test/java/org/neo4j/server/security/TestSslCertificateFactory.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