Duplicity

Merge proposals dependent on lp://qastaging/~crosser/duplicity/fix-small-file-upload

  1. fix-small-file-upload
  2. Dependent merge proposals

lp://qastaging/~crosser/duplicity/fix-small-file-upload has no merge proposals.