Merge proposals dependent on lp://staging/~xnox/partman-crypto/r-proposed

lp://staging/~xnox/partman-crypto/r-proposed has no merge proposals.