Merge proposals dependent on lp:~dobey/ubuntuone-client/fix-692566

lp:~dobey/ubuntuone-client/fix-692566 has no merge proposals.