Merge proposals dependent on lp://staging/~thomas-voss/biometryd/restructure-cli

lp://staging/~thomas-voss/biometryd/restructure-cli has no merge proposals.