Update feature/perf from master

[edwintorok]

This is needed to fix the CI failure in https://github.com/xapi-project/xen-api/pull/5760. More code got pushed to master since last time I merged, and although the branch itself builds fine and passes tests, once merged to master it fails to build (due to missing dependencies on master that happened to work due to transitive dependencies being enabled, but they are disabled on this branch).

The change to get master to work once merged:

diff --git a/ocaml/libs/clock/dune b/ocaml/libs/clock/dune
index 009e2ba717..3276c2c08f 100644
--- a/ocaml/libs/clock/dune
+++ b/ocaml/libs/clock/dune
@@ -16,5 +16,5 @@
   (names test_date test_timer)
   (package clock)
   (modules test_date test_timer)
-  (libraries alcotest clock fmt mtime ptime qcheck-core qcheck-core.runner)
+  (libraries alcotest clock fmt mtime mtime.clock.os ptime qcheck-core qcheck-core.runner)
 )
diff --git a/ocaml/libs/http-lib/dune b/ocaml/libs/http-lib/dune
index 3fc174170d..ee510d7fc4 100644
--- a/ocaml/libs/http-lib/dune
+++ b/ocaml/libs/http-lib/dune
@@ -45,6 +45,7 @@
     ipaddr
     polly
     threads.posix
+    uri
     xapi-log
     xapi-stdext-pervasives
     xapi-stdext-threads
diff --git a/ocaml/xapi/dune b/ocaml/xapi/dune
index 131503a224..d186e11380 100644
--- a/ocaml/xapi/dune
+++ b/ocaml/xapi/dune
@@ -64,6 +64,7 @@
     astring
     cstruct
     base64
+    clock
     cohttp
     cohttp_posix
     domain-name

This also includes https://github.com/xapi-project/xen-api/pull/5761

[edwintorok]

Marking this as a draft because quicktests on master are currently broken, once a fix is merged to master this PR will need to be updated.

[edwintorok]

Now that anti-affinity is merged, I'll update this PR. Updated.