Merge proposals dependent on lp://qastaging/~aaron-whitehouse/duplicity/bug_932482_trailing_slashes_and_wildcards_error

1. bug_932482_trailing_slashes_and_wildcards_error
2. Dependent merge proposals