Merge proposals dependent on lp://qastaging/~thisfred/ubuntuone-control-panel/gui-service

lp://qastaging/~thisfred/ubuntuone-control-panel/gui-service has no merge proposals.