Merge proposals dependent on lp://qastaging/~nataliabidart/ubuntuone-control-panel/disable-files

lp://qastaging/~nataliabidart/ubuntuone-control-panel/disable-files has no merge proposals.