Merge proposals dependent on lp://staging/~xnox/debian-cd/add_secured-fixes

lp://staging/~xnox/debian-cd/add_secured-fixes has no merge proposals.