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

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