CIP: Bump version suffix to -cip23 after merge from stable

...plus fixes for regressions, and a missing dependency.

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
diff --git a/localversion-cip b/localversion-cip
index 4b19f16..1fef53f 100644
--- a/localversion-cip
+++ b/localversion-cip
@@ -1 +1 @@
--cip22
+-cip23