Merge proposals dependent on lp:~mandel/ubuntuone-control-panel/fix-broken-tests

lp:~mandel/ubuntuone-control-panel/fix-broken-tests has no merge proposals.