Merge proposals dependent on lp://qastaging/~thisfred/ubuntuone-control-panel/use-u1lint

lp://qastaging/~thisfred/ubuntuone-control-panel/use-u1lint has no merge proposals.