Merge proposals dependent on lp:~nataliabidart/ubuntuone-client/fix-803598

lp:~nataliabidart/ubuntuone-client/fix-803598 has no merge proposals.