Merge proposals dependent on lp:~verterok/ubuntuone-client/fix-987376

lp:~verterok/ubuntuone-client/fix-987376 has no merge proposals.