Merge proposals dependent on lp://staging/~rye/ubuntuone-client/ignore-in-close-write-in-dirs-stable-3-0

1. ignore-in-close-write-in-dirs-stable-3-0
2. Dependent merge proposals