Upgraded dependencies
Fixed broken request monitor in test
Fixed Jetty/Batching issues
Merge branch 'master' into updatedeps

Conflicts:
	community/kernel/pom.xml
	community/server-api/LICENSES.txt
	community/server-api/NOTICE.txt
	community/server-examples/LICENSES.txt
	community/server-examples/NOTICE.txt
	community/server/src/test/java/org/neo4j/server/rest/streaming/StreamingBatchOperationDocIT.java
	enterprise/enterprise-performance-tests/LICENSES.txt
	enterprise/enterprise-performance-tests/NOTICE.txt
Merge branch 'master' into updatedeps

Conflicts:
	community/kernel/pom.xml
	community/server-api/LICENSES.txt
	community/server-api/NOTICE.txt
	community/server-examples/LICENSES.txt
	community/server-examples/NOTICE.txt
	community/server/src/test/java/org/neo4j/server/rest/streaming/StreamingBatchOperationDocIT.java
	enterprise/enterprise-performance-tests/LICENSES.txt
	enterprise/enterprise-performance-tests/NOTICE.txt
Updated licenses and notice for manual
Merge branch 'master' into updatedeps
Updated license and notice files
Merge pull request #2609 from rickardoberg/updatedeps

Upgraded dependencies
Merge remote-tracking branch 'upstream/master'