Merge proposals dependent on lp://qastaging/~thisfred/ubuntuone-client/fix-stale-notification-3-0

1. fix-stale-notification-3-0
2. Dependent merge proposals