Merge proposals dependent on lp:~mandel/ubuntuone-client/fix-802728

lp:~mandel/ubuntuone-client/fix-802728 has no merge proposals.