Merge proposals dependent on lp:~brian.curtin/ubuntuone-client/820350-fix-readonly-readwrite

1. 820350-fix-readonly-readwrite
2. Dependent merge proposals