Merge proposals dependent on lp://staging/~matthew-gretton-dann/cbuild/cbuild-init

lp://staging/~matthew-gretton-dann/cbuild/cbuild-init has no merge proposals.