Merge proposals dependent on lp://qastaging/~chipaca/ubuntuone-control-panel/fix-690325

lp://qastaging/~chipaca/ubuntuone-control-panel/fix-690325 has no merge proposals.