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

...plus fixes for regressions, and missing pieces.

Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk>
diff --git a/localversion-cip b/localversion-cip
index fdbd1ce..b7919e7 100644
--- a/localversion-cip
+++ b/localversion-cip
@@ -1 +1 @@
--cip20
+-cip21