Merge proposals dependent on lp://staging/~mterry/deja-dup/tell-user-when-we-cant-restore-files

1. tell-user-when-we-cant-restore-files
2. Dependent merge proposals