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

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